From adcfe4df35a44ebfec85faf894bed60ea401f4b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Thu, 7 Apr 2022 23:27:18 +0200 Subject: [PATCH 01/14] Add Vcpkg manifest + MSBuild integration --- .github/workflows/msvc.yml | 2 -- .gitignore | 1 + capture/build/win32/capture.vcxproj | 3 +++ csvexport/build/win32/csvexport.vcxproj | 3 +++ import-chrome/build/win32/import-chrome.vcxproj | 3 +++ profiler/build/win32/Tracy.vcxproj | 3 +++ update/build/win32/update.vcxproj | 3 +++ vcpkg.json | 13 +++++++++++++ 8 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 vcpkg.json diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 3ed09fb9..89aca044 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -16,8 +16,6 @@ jobs: - uses: microsoft/setup-msbuild@v1.0.2 - name: Integrate vcpkg run: vcpkg integrate install - - name: Build vcpkg libraries - run: vcpkg install freetype glfw3 capstone[arm,arm64,x86] --triplet x64-windows-static - name: Profiler GUI Debug run: msbuild .\profiler\build\win32\Tracy.vcxproj /property:Configuration=Debug /property:Platform=x64 - name: Profiler GUI Release diff --git a/.gitignore b/.gitignore index c930fe63..40921279 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ 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 .vscode/ diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj index 569b3214..c4d4616f 100644 --- a/capture/build/win32/capture.vcxproj +++ b/capture/build/win32/capture.vcxproj @@ -44,6 +44,9 @@ + + true + Level3 diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj index f5457414..49b974a4 100644 --- a/csvexport/build/win32/csvexport.vcxproj +++ b/csvexport/build/win32/csvexport.vcxproj @@ -44,6 +44,9 @@ + + true + Level3 diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj index 8a7758ab..b8cf7c74 100644 --- a/import-chrome/build/win32/import-chrome.vcxproj +++ b/import-chrome/build/win32/import-chrome.vcxproj @@ -44,6 +44,9 @@ + + true + Level3 diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index ceeaee4d..29697588 100644 --- a/profiler/build/win32/Tracy.vcxproj +++ b/profiler/build/win32/Tracy.vcxproj @@ -51,6 +51,9 @@ static MultiThreadedDLL + + true + Level3 diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj index 0091ba47..9c6d8651 100644 --- a/update/build/win32/update.vcxproj +++ b/update/build/win32/update.vcxproj @@ -44,6 +44,9 @@ + + true + Level3 diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 00000000..b4109e3a --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,13 @@ +{ + "$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", + "builtin-baseline": "af2287382b1991dbdcb7e5112d236f3323b9dd7a", + "dependencies": [ + { "name": "capstone", "features":[ "arm", "arm64", "x86" ] }, + "freetype", + "glfw3" + ] +} From 67d255f2bbd2a96604284f5324979b143b52ed23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Thu, 7 Apr 2022 23:33:03 +0200 Subject: [PATCH 02/14] Test MSVC Workflow --- .github/workflows/msvc.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 89aca044..2b642716 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -1,10 +1,6 @@ name: MSVC -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] +on: push jobs: build: From 1fabf9dfa55a745e2ea25ce6b4839ceee99fd960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Thu, 7 Apr 2022 23:46:39 +0200 Subject: [PATCH 03/14] Update vcxproj vcpkg path --- 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 c4d4616f..536f1ad6 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\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\debug\lib + ..\..\..\vcpkg_installed\x64-windows-static\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\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\lib + ..\..\..\vcpkg_installed\x64-windows-static\lib diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj index 49b974a4..efb56f77 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\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\debug\lib + ..\..\..\vcpkg_installed\x64-windows-static\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\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\lib + ..\..\..\vcpkg_installed\x64-windows-static\lib diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj index b8cf7c74..6fc428bc 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\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\debug\lib + ..\..\..\vcpkg_installed\x64-windows-static\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\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\lib + ..\..\..\vcpkg_installed\x64-windows-static\lib diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index 29697588..590b831a 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\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + ..\..\..\imgui;..\..\..\vcpkg_installed\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\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\vcpkg\installed\x64-windows-static\debug\lib + ..\..\..\vcpkg_installed\x64-windows-static\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\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + ..\..\..\imgui;..\..\..\vcpkg_installed\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\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\vcpkg\installed\x64-windows-static\lib + ..\..\..\vcpkg_installed\x64-windows-static\lib true diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj index 9c6d8651..e32df34f 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\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\debug\lib + ..\..\..\vcpkg_installed\x64-windows-static\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\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\lib + ..\..\..\vcpkg_installed\x64-windows-static\lib From 3adc55d66d46d4d0220f40a6832b3aaa28112ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Thu, 7 Apr 2022 23:55:34 +0200 Subject: [PATCH 04/14] Fix weird path ? --- 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 536f1ad6..15f73a98 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\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\debug\lib + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\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\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\lib + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\lib diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj index efb56f77..4f531df0 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\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\debug\lib + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\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\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\lib + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\lib diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj index 6fc428bc..4ff089a7 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\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\debug\lib + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\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\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\lib + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\lib diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index 590b831a..b6007c9b 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\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + ..\..\..\imgui;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\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\x64-windows-static\debug\lib + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\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\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + ..\..\..\imgui;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\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\x64-windows-static\lib + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\lib true diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj index e32df34f..ee6bcb5c 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\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\debug\lib + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\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\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\lib + ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\lib From 599098912e66dfb5d51caecb2d13659255be2e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Mon, 11 Apr 2022 21:55:14 +0200 Subject: [PATCH 05/14] Remove superfluous vcxproj setup thanks to vcpkg integration --- 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 ++++------ 5 files changed, 20 insertions(+), 30 deletions(-) diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj index 15f73a98..dc9901b1 100644 --- a/capture/build/win32/capture.vcxproj +++ b/capture/build/win32/capture.vcxproj @@ -57,12 +57,11 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone - ws2_32.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\debug\lib @@ -77,14 +76,13 @@ 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\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true - ws2_32.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\lib diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj index 4f531df0..252ebc62 100644 --- a/csvexport/build/win32/csvexport.vcxproj +++ b/csvexport/build/win32/csvexport.vcxproj @@ -57,12 +57,11 @@ _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone - ws2_32.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\debug\lib @@ -77,14 +76,13 @@ NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true - ws2_32.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\lib diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj index 4ff089a7..5184c5d1 100644 --- a/import-chrome/build/win32/import-chrome.vcxproj +++ b/import-chrome/build/win32/import-chrome.vcxproj @@ -57,12 +57,11 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone - ws2_32.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\debug\lib @@ -77,14 +76,13 @@ 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\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true - ws2_32.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\lib diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index b6007c9b..2a5ad18c 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\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) true false true @@ -70,9 +70,8 @@ Fast - brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Windows - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\debug\lib true @@ -86,7 +85,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\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) true true AdvancedVectorExtensions2 @@ -97,9 +96,8 @@ true true - brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Windows - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\lib true diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj index ee6bcb5c..4ff0ca1e 100644 --- a/update/build/win32/update.vcxproj +++ b/update/build/win32/update.vcxproj @@ -57,12 +57,11 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone - ws2_32.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\debug\lib @@ -77,14 +76,13 @@ 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\x64-windows-static\x64-windows-static\include;..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone true true - ws2_32.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Console - ..\..\..\vcpkg_installed\x64-windows-static\x64-windows-static\lib From f8f74c5f572fdcf9c550d4fdd858b5f961e73635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Mon, 11 Apr 2022 23:01:15 +0200 Subject: [PATCH 06/14] Support capstone 5 from vcpkg --- server/TracySourceView.cpp | 2 +- server/TracyWorker.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/TracySourceView.cpp b/server/TracySourceView.cpp index 60663a99..141b6c25 100644 --- a/server/TracySourceView.cpp +++ b/server/TracySourceView.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include "imgui.h" #include "TracyCharUtil.hpp" diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index bbe3e412..e048e697 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #define ZDICT_STATIC_LINKING_ONLY #include "../zstd/zdict.h" From 9d3725fecf224599a18ab63b91c9077d44c8f9cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Wed, 13 Apr 2022 11:45:56 +0200 Subject: [PATCH 07/14] Test on gcc.yml --- .github/workflows/gcc.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 0a6114a8..2e412df5 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -1,10 +1,6 @@ name: gcc -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] +on: push jobs: build: From c22248d8e74947b7347e8a656b06907a9098b14e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Wed, 13 Apr 2022 12:06:51 +0200 Subject: [PATCH 08/14] Restore CI --- .github/workflows/gcc.yml | 6 +++++- .github/workflows/msvc.yml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 2e412df5..0a6114a8 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -1,6 +1,10 @@ name: gcc -on: push +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] jobs: build: diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 2b642716..89aca044 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -1,6 +1,10 @@ name: MSVC -on: push +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] jobs: build: From eda71a1983a4e86e5f4f801ec9b190446369eea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Wed, 13 Apr 2022 12:31:46 +0200 Subject: [PATCH 09/14] Bump vcpkg baseline --- vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index b4109e3a..7166aa6e 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -4,7 +4,7 @@ "version-semver": "0.8.0", "description": "C++ frame profiler", "homepage": "https://github.com/wolfpld/tracy", - "builtin-baseline": "af2287382b1991dbdcb7e5112d236f3323b9dd7a", + "builtin-baseline": "65c66cd748d48cfa8f02df8c434adbd862ef1dd2", "dependencies": [ { "name": "capstone", "features":[ "arm", "arm64", "x86" ] }, "freetype", From dad0f039c167aaebaa087b04e752b73742ba2885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Wed, 13 Apr 2022 13:00:04 +0200 Subject: [PATCH 10/14] Revert "Support capstone 5 from vcpkg" This reverts commit 504f341f9f2c9a7f770c7a797ece961cf9c1caed. --- server/TracySourceView.cpp | 2 +- server/TracyWorker.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/TracySourceView.cpp b/server/TracySourceView.cpp index 141b6c25..60663a99 100644 --- a/server/TracySourceView.cpp +++ b/server/TracySourceView.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include "imgui.h" #include "TracyCharUtil.hpp" diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index e048e697..bbe3e412 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #define ZDICT_STATIC_LINKING_ONLY #include "../zstd/zdict.h" From fa8bcdfb300bcca6ab65fcace614122a9d4ba05d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Wed, 20 Apr 2022 09:44:13 +0200 Subject: [PATCH 11/14] Inject appropriate path for manifest install --- 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 dc9901b1..7da266f7 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 - $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone ws2_32.lib;%(AdditionalDependencies) @@ -76,7 +76,7 @@ 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 + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone true diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj index 252ebc62..349c5101 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 - $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone ws2_32.lib;%(AdditionalDependencies) @@ -76,7 +76,7 @@ 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 + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone true diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj index 5184c5d1..62719133 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 - $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone ws2_32.lib;%(AdditionalDependencies) @@ -76,7 +76,7 @@ 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 + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone true diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index 2a5ad18c..99a896ac 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;%(AdditionalIncludeDirectories) + ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) true false true @@ -85,7 +85,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;%(AdditionalIncludeDirectories) + ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) true true AdvancedVectorExtensions2 diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj index 4ff0ca1e..dbe88685 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 - $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone ws2_32.lib;%(AdditionalDependencies) @@ -76,7 +76,7 @@ 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 + $(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;..\..\..\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone true From fc5fa369c849888afca63dfb21947c55bf80b8db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Sun, 8 May 2022 23:46:00 +0200 Subject: [PATCH 12/14] Remove vcpkg builtin-baseline --- vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index 7166aa6e..1218c585 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -4,7 +4,6 @@ "version-semver": "0.8.0", "description": "C++ frame profiler", "homepage": "https://github.com/wolfpld/tracy", - "builtin-baseline": "65c66cd748d48cfa8f02df8c434adbd862ef1dd2", "dependencies": [ { "name": "capstone", "features":[ "arm", "arm64", "x86" ] }, "freetype", From 8139d94e146942de27c05b13e69aae701b6ca78c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Sun, 22 May 2022 22:46:32 +0200 Subject: [PATCH 13/14] Add information about vcpkg manifest mode in the manual --- manual/tracy.tex | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/manual/tracy.tex b/manual/tracy.tex index 6da53ebc..e71a903b 100644 --- a/manual/tracy.tex +++ b/manual/tracy.tex @@ -747,11 +747,13 @@ There are two ways you can run \texttt{vcpkg} to install the dependencies for Tr vcpkg\install_vcpkg_dependencies.bat \end{lstlisting} This writes files only to the \texttt{vcpkg\textbackslash{}vcpkg} directory and makes no other changes on your machine. -\item System-wide installation -- install \texttt{vcpkg} by following the instructions on its website, and then execute the following commands: +\item System-wide installation with Manifest mode -- install \texttt{vcpkg} by following the instructions on its website, make sure that the environment variable \texttt{VCPKG_ROOT} is set to the path where you have clone the repository, and then execute the following command: \begin{lstlisting}[language=sh] vcpkg integrate install -vcpkg install --triplet x64-windows-static freetype glfw3 capstone[arm,arm64,x86] \end{lstlisting} +After this step, you can use any Visual Studio project files to build as usual. +Dependencies will be installed automatically based on vcpkg manifest listing (the \texttt{vcpkg.json} file at repository root). +For more information about vcpkg manifest mode in Visual Studio, you can read more details at the following address: \url{https://vcpkg.io/en/docs/users/manifests.html#msbuild-integration}. \end{itemize} \paragraph{Unix} From 4efcb8c3f5a0a24b71a9e9c28cb08d8ce2f72cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Sat, 4 Jun 2022 13:54:20 +0200 Subject: [PATCH 14/14] Fix Manual --- manual/tracy.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual/tracy.tex b/manual/tracy.tex index e71a903b..3c9cb467 100644 --- a/manual/tracy.tex +++ b/manual/tracy.tex @@ -747,7 +747,7 @@ There are two ways you can run \texttt{vcpkg} to install the dependencies for Tr vcpkg\install_vcpkg_dependencies.bat \end{lstlisting} This writes files only to the \texttt{vcpkg\textbackslash{}vcpkg} directory and makes no other changes on your machine. -\item System-wide installation with Manifest mode -- install \texttt{vcpkg} by following the instructions on its website, make sure that the environment variable \texttt{VCPKG_ROOT} is set to the path where you have clone the repository, and then execute the following command: +\item System-wide installation with Manifest mode -- install \texttt{vcpkg} by following the instructions on its website, make sure that the environment variable \texttt{VCPKG\_ROOT} is set to the path where you have clone the repository, and then execute the following command: \begin{lstlisting}[language=sh] vcpkg integrate install \end{lstlisting}