diff --git a/.gitignore b/.gitignore index dce2e5ae..53b46644 100644 --- a/.gitignore +++ b/.gitignore @@ -29,10 +29,6 @@ manual/t*.fdb_latexmk manual/t*.fls profiler/build/win32/packages profiler/build/win32/Tracy.aps -# include the vcpkg install script but not the files it produces -vcpkg/* -!vcpkg/install_vcpkg_dependencies.bat -/vcpkg_installed .deps/ .dirstamp /_*/** diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 9c565693..9442b7b1 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -3,11 +3,6 @@ set (ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../") -if (EXISTS ${ROOT_DIR}/vcpkg_installed/x64-windows-static/lib/pkgconfig) - message(STATUS "Using vcpkg_installed/x64-windows-static/lib/pkgconfig") - set(ENV{PKG_CONFIG_PATH} "${ROOT_DIR}/vcpkg_installed/x64-windows-static/lib/pkgconfig") -endif() - if(WIN32) add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN) endif() diff --git a/vcpkg.json b/vcpkg.json deleted file mode 100644 index 1218c585..00000000 --- a/vcpkg.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", - "name": "tracy", - "version-semver": "0.8.0", - "description": "C++ frame profiler", - "homepage": "https://github.com/wolfpld/tracy", - "dependencies": [ - { "name": "capstone", "features":[ "arm", "arm64", "x86" ] }, - "freetype", - "glfw3" - ] -} diff --git a/vcpkg/install_vcpkg_dependencies.bat b/vcpkg/install_vcpkg_dependencies.bat deleted file mode 100644 index d858a660..00000000 --- a/vcpkg/install_vcpkg_dependencies.bat +++ /dev/null @@ -1,17 +0,0 @@ -@echo off -setlocal - -pushd %~dp0 - -REM get vcpkg distribution -if not exist vcpkg git clone https://github.com/Microsoft/vcpkg.git || exit /b 1 - -REM build vcpkg -if not exist vcpkg\vcpkg.exe call vcpkg\bootstrap-vcpkg.bat -disableMetrics || exit /b 2 - -set VCPKG_ROOT=%cd%\vcpkg - -REM install required packages -vcpkg\vcpkg.exe install --triplet x64-windows-static || exit /b 3 - -popd