From 6aec95e7395f56579c889c7942845443d49d1a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Mon, 13 Jun 2022 22:30:56 +0200 Subject: [PATCH 1/7] Fix vcxproj support without `vcpkg integrate install` --- capture/build/win32/capture.vcxproj | 10 ++++++---- csvexport/build/win32/csvexport.vcxproj | 10 ++++++---- import-chrome/build/win32/import-chrome.vcxproj | 10 ++++++---- profiler/build/win32/Tracy.vcxproj | 10 ++++++---- update/build/win32/update.vcxproj | 10 ++++++---- vcpkg/install_vcpkg_dependencies.bat | 2 +- 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj index 7da266f7..72a047c5 100644 --- a/capture/build/win32/capture.vcxproj +++ b/capture/build/win32/capture.vcxproj @@ -57,11 +57,12 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone - ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib @@ -76,13 +77,14 @@ TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true - ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj index 349c5101..f59a28a9 100644 --- a/csvexport/build/win32/csvexport.vcxproj +++ b/csvexport/build/win32/csvexport.vcxproj @@ -57,11 +57,12 @@ _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone - ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib @@ -76,13 +77,14 @@ NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true - ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj index 62719133..201b10b2 100644 --- a/import-chrome/build/win32/import-chrome.vcxproj +++ b/import-chrome/build/win32/import-chrome.vcxproj @@ -57,11 +57,12 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone - ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib @@ -76,13 +77,14 @@ TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true - ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index 99a896ac..b26209e3 100644 --- a/profiler/build/win32/Tracy.vcxproj +++ b/profiler/build/win32/Tracy.vcxproj @@ -60,7 +60,7 @@ Disabled true _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) - ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + ..\..\..\imgui;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) true false true @@ -70,8 +70,9 @@ Fast - ws2_32.lib;%(AdditionalDependencies) + brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies) Windows + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib true @@ -85,7 +86,7 @@ true true NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) - ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + ..\..\..\imgui;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) true true AdvancedVectorExtensions2 @@ -96,8 +97,9 @@ true true - ws2_32.lib;%(AdditionalDependencies) + brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies) Windows + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib true diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj index dbe88685..1904f48f 100644 --- a/update/build/win32/update.vcxproj +++ b/update/build/win32/update.vcxproj @@ -57,11 +57,12 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone - ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib @@ -76,13 +77,14 @@ TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true - ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib diff --git a/vcpkg/install_vcpkg_dependencies.bat b/vcpkg/install_vcpkg_dependencies.bat index 9ea72915..da8145f1 100644 --- a/vcpkg/install_vcpkg_dependencies.bat +++ b/vcpkg/install_vcpkg_dependencies.bat @@ -9,6 +9,6 @@ REM build vcpkg if not exist vcpkg\vcpkg.exe call vcpkg\bootstrap-vcpkg.bat -disableMetrics REM install required packages -vcpkg\vcpkg.exe install --triplet x64-windows-static freetype glfw3 capstone[arm,arm64,x86] +vcpkg\vcpkg.exe install --triplet x64-windows-static popd From 2b3ce6dd80a496b43e97263e53dd365fabb0d047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Fri, 17 Jun 2022 22:16:11 +0200 Subject: [PATCH 2/7] Test both way to pull vcpkg dependencies in CI --- .github/workflows/msvc.yml | 52 +++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 89aca044..167ba042 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -7,7 +7,7 @@ on: branches: [ master ] jobs: - build: + build-with-vcpkg-integration: runs-on: windows-2022 @@ -53,3 +53,53 @@ jobs: - uses: actions/upload-artifact@v2 with: path: Tracy.7z + + build-without-vcpkg-integration: + + runs-on: windows-2022 + + env: + VCPKG_ROOT: '' + + steps: + - uses: actions/checkout@v2 + - uses: microsoft/setup-msbuild@v1.0.2 + - name: Install vcpkg dependencies + run: vcpkg/install_vcpkg_dependencies.bat + - name: Profiler GUI Debug + run: msbuild .\profiler\build\win32\Tracy.vcxproj /property:Configuration=Debug /property:Platform=x64 + - name: Profiler GUI Release + run: msbuild .\profiler\build\win32\Tracy.vcxproj /property:Configuration=Release /property:Platform=x64 + - name: Update utility Debug + run: msbuild .\update\build\win32\update.vcxproj /property:Configuration=Debug /property:Platform=x64 + - name: Update utility Release + run: msbuild .\update\build\win32\update.vcxproj /property:Configuration=Release /property:Platform=x64 + - name: Capture utility Debug + run: msbuild .\capture\build\win32\capture.vcxproj /property:Configuration=Debug /property:Platform=x64 + - name: Capture utility Release + run: msbuild .\capture\build\win32\capture.vcxproj /property:Configuration=Release /property:Platform=x64 + - name: Csvexport utility Debug + run: msbuild .\csvexport\build\win32\csvexport.vcxproj /property:Configuration=Debug /property:Platform=x64 + - name: Csvexport utility Release + run: msbuild .\csvexport\build\win32\csvexport.vcxproj /property:Configuration=Release /property:Platform=x64 + - name: Import-chrome utility Debug + run: msbuild .\import-chrome\build\win32\import-chrome.vcxproj /property:Configuration=Debug /property:Platform=x64 + - name: Import-chrome utility Release + run: msbuild .\import-chrome\build\win32\import-chrome.vcxproj /property:Configuration=Release /property:Platform=x64 + - name: Library + run: msbuild .\library\win32\TracyProfiler.vcxproj /property:Configuration=Release /property:Platform=x64 + - name: Package binaries + run: | + mkdir bin + mkdir bin\dev + copy profiler\build\win32\x64\Release\Tracy.exe bin + copy update\build\win32\x64\Release\update.exe bin + copy capture\build\win32\x64\Release\capture.exe bin + copy import-chrome\build\win32\x64\Release\import-chrome.exe bin + copy csvexport\build\win32\x64\Release\csvexport.exe bin + copy library\win32\x64\Release\TracyProfiler.dll bin\dev + copy library\win32\x64\Release\TracyProfiler.lib bin\dev + 7z a Tracy.7z bin + - uses: actions/upload-artifact@v2 + with: + path: Tracy.7z From 5e9b007e9026f53e0fc611243a905d00f12bfcd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Fri, 17 Jun 2022 22:53:59 +0200 Subject: [PATCH 3/7] Uses $(VcpkgManifestRoot) for vcpkg msbuild integration paths. --- capture/build/win32/capture.vcxproj | 4 ++-- csvexport/build/win32/csvexport.vcxproj | 4 ++-- import-chrome/build/win32/import-chrome.vcxproj | 4 ++-- profiler/build/win32/Tracy.vcxproj | 4 ++-- update/build/win32/update.vcxproj | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj index 72a047c5..dc00d9e9 100644 --- a/capture/build/win32/capture.vcxproj +++ b/capture/build/win32/capture.vcxproj @@ -57,7 +57,7 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) @@ -77,7 +77,7 @@ TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj index f59a28a9..1258bc55 100644 --- a/csvexport/build/win32/csvexport.vcxproj +++ b/csvexport/build/win32/csvexport.vcxproj @@ -57,7 +57,7 @@ _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) @@ -77,7 +77,7 @@ NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj index 201b10b2..c1a40a24 100644 --- a/import-chrome/build/win32/import-chrome.vcxproj +++ b/import-chrome/build/win32/import-chrome.vcxproj @@ -57,7 +57,7 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) @@ -77,7 +77,7 @@ TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index b26209e3..e8a326bc 100644 --- a/profiler/build/win32/Tracy.vcxproj +++ b/profiler/build/win32/Tracy.vcxproj @@ -60,7 +60,7 @@ Disabled true _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) - ..\..\..\imgui;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + ..\..\..\imgui;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) true false true @@ -86,7 +86,7 @@ true true NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) - ..\..\..\imgui;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + ..\..\..\imgui;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) true true AdvancedVectorExtensions2 diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj index 1904f48f..28e10538 100644 --- a/update/build/win32/update.vcxproj +++ b/update/build/win32/update.vcxproj @@ -57,7 +57,7 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) @@ -77,7 +77,7 @@ TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true From 84319911c5a4a152f5574b398a923e476414984c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Fri, 17 Jun 2022 23:19:02 +0200 Subject: [PATCH 4/7] Use $(ProjectDir) for vcpkg msbuild without integration paths. --- capture/build/win32/capture.vcxproj | 8 ++++---- csvexport/build/win32/csvexport.vcxproj | 8 ++++---- import-chrome/build/win32/import-chrome.vcxproj | 8 ++++---- profiler/build/win32/Tracy.vcxproj | 8 ++++---- update/build/win32/update.vcxproj | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj index dc00d9e9..509c37b2 100644 --- a/capture/build/win32/capture.vcxproj +++ b/capture/build/win32/capture.vcxproj @@ -57,12 +57,12 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib @@ -77,14 +77,14 @@ TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj index 1258bc55..0a187883 100644 --- a/csvexport/build/win32/csvexport.vcxproj +++ b/csvexport/build/win32/csvexport.vcxproj @@ -57,12 +57,12 @@ _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib @@ -77,14 +77,14 @@ NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj index c1a40a24..ec6e5bdd 100644 --- a/import-chrome/build/win32/import-chrome.vcxproj +++ b/import-chrome/build/win32/import-chrome.vcxproj @@ -57,12 +57,12 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib @@ -77,14 +77,14 @@ TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index e8a326bc..06390deb 100644 --- a/profiler/build/win32/Tracy.vcxproj +++ b/profiler/build/win32/Tracy.vcxproj @@ -60,7 +60,7 @@ Disabled true _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) - ..\..\..\imgui;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + ..\..\..\imgui;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) true false true @@ -72,7 +72,7 @@ brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies) Windows - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib true @@ -86,7 +86,7 @@ true true NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) - ..\..\..\imgui;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + ..\..\..\imgui;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) true true AdvancedVectorExtensions2 @@ -99,7 +99,7 @@ true brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies) Windows - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib true diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj index 28e10538..6ccb5cbc 100644 --- a/update/build/win32/update.vcxproj +++ b/update/build/win32/update.vcxproj @@ -57,12 +57,12 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib @@ -77,14 +77,14 @@ TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib + $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib From 087e1d803632e86e2be743bcbe16425cbea3a797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Sat, 18 Jun 2022 17:15:28 +0200 Subject: [PATCH 5/7] Fail with error code if install_vcpkg_dependencies.bat commands fail --- vcpkg/install_vcpkg_dependencies.bat | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vcpkg/install_vcpkg_dependencies.bat b/vcpkg/install_vcpkg_dependencies.bat index da8145f1..d858a660 100644 --- a/vcpkg/install_vcpkg_dependencies.bat +++ b/vcpkg/install_vcpkg_dependencies.bat @@ -1,14 +1,17 @@ @echo off +setlocal pushd %~dp0 REM get vcpkg distribution -if not exist vcpkg git clone https://github.com/Microsoft/vcpkg.git +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 +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 +vcpkg\vcpkg.exe install --triplet x64-windows-static || exit /b 3 popd From 75c383a68cb49b431ce87b16fab33a50a6dd4fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Sun, 26 Jun 2022 23:13:32 +0200 Subject: [PATCH 6/7] non need to package binaries in `build-without-vcpkg-integration` --- .github/workflows/msvc.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 167ba042..5fc64f23 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -88,18 +88,3 @@ jobs: run: msbuild .\import-chrome\build\win32\import-chrome.vcxproj /property:Configuration=Release /property:Platform=x64 - name: Library run: msbuild .\library\win32\TracyProfiler.vcxproj /property:Configuration=Release /property:Platform=x64 - - name: Package binaries - run: | - mkdir bin - mkdir bin\dev - copy profiler\build\win32\x64\Release\Tracy.exe bin - copy update\build\win32\x64\Release\update.exe bin - copy capture\build\win32\x64\Release\capture.exe bin - copy import-chrome\build\win32\x64\Release\import-chrome.exe bin - copy csvexport\build\win32\x64\Release\csvexport.exe bin - copy library\win32\x64\Release\TracyProfiler.dll bin\dev - copy library\win32\x64\Release\TracyProfiler.lib bin\dev - 7z a Tracy.7z bin - - uses: actions/upload-artifact@v2 - with: - path: Tracy.7z From 2eed89f0d8bf78801963ecf3f22322a68d560ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Sun, 26 Jun 2022 23:22:24 +0200 Subject: [PATCH 7/7] only build Tracy/capture Release for `build-without-vcpkg-integration` --- .github/workflows/msvc.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 5fc64f23..122b754b 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -66,25 +66,7 @@ jobs: - uses: microsoft/setup-msbuild@v1.0.2 - name: Install vcpkg dependencies run: vcpkg/install_vcpkg_dependencies.bat - - name: Profiler GUI Debug - run: msbuild .\profiler\build\win32\Tracy.vcxproj /property:Configuration=Debug /property:Platform=x64 - name: Profiler GUI Release run: msbuild .\profiler\build\win32\Tracy.vcxproj /property:Configuration=Release /property:Platform=x64 - - name: Update utility Debug - run: msbuild .\update\build\win32\update.vcxproj /property:Configuration=Debug /property:Platform=x64 - - name: Update utility Release - run: msbuild .\update\build\win32\update.vcxproj /property:Configuration=Release /property:Platform=x64 - - name: Capture utility Debug - run: msbuild .\capture\build\win32\capture.vcxproj /property:Configuration=Debug /property:Platform=x64 - name: Capture utility Release run: msbuild .\capture\build\win32\capture.vcxproj /property:Configuration=Release /property:Platform=x64 - - name: Csvexport utility Debug - run: msbuild .\csvexport\build\win32\csvexport.vcxproj /property:Configuration=Debug /property:Platform=x64 - - name: Csvexport utility Release - run: msbuild .\csvexport\build\win32\csvexport.vcxproj /property:Configuration=Release /property:Platform=x64 - - name: Import-chrome utility Debug - run: msbuild .\import-chrome\build\win32\import-chrome.vcxproj /property:Configuration=Debug /property:Platform=x64 - - name: Import-chrome utility Release - run: msbuild .\import-chrome\build\win32\import-chrome.vcxproj /property:Configuration=Release /property:Platform=x64 - - name: Library - run: msbuild .\library\win32\TracyProfiler.vcxproj /property:Configuration=Release /property:Platform=x64