diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
index 89aca044..122b754b 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,20 @@ 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 Release
+ run: msbuild .\profiler\build\win32\Tracy.vcxproj /property:Configuration=Release /property:Platform=x64
+ - name: Capture utility Release
+ run: msbuild .\capture\build\win32\capture.vcxproj /property:Configuration=Release /property:Platform=x64
diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj
index 7da266f7..509c37b2 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
+ $(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;%(AdditionalDependencies)
+ ws2_32.lib;capstone.lib;%(AdditionalDependencies)
Console
+ $(ProjectDir)..\..\..\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
+ $(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;%(AdditionalDependencies)
+ ws2_32.lib;capstone.lib;%(AdditionalDependencies)
Console
+ $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib
diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj
index 349c5101..0a187883 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
+ $(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;%(AdditionalDependencies)
+ ws2_32.lib;capstone.lib;%(AdditionalDependencies)
Console
+ $(ProjectDir)..\..\..\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
+ $(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;%(AdditionalDependencies)
+ ws2_32.lib;capstone.lib;%(AdditionalDependencies)
Console
+ $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib
diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj
index 62719133..ec6e5bdd 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
+ $(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;%(AdditionalDependencies)
+ ws2_32.lib;capstone.lib;%(AdditionalDependencies)
Console
+ $(ProjectDir)..\..\..\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
+ $(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;%(AdditionalDependencies)
+ ws2_32.lib;capstone.lib;%(AdditionalDependencies)
Console
+ $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib
diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj
index ccefedf5..7be39025 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;$(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
@@ -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
+ $(ProjectDir)..\..\..\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;$(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
@@ -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
+ $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib
true
diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj
index dbe88685..6ccb5cbc 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
+ $(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;%(AdditionalDependencies)
+ ws2_32.lib;capstone.lib;%(AdditionalDependencies)
Console
+ $(ProjectDir)..\..\..\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
+ $(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;%(AdditionalDependencies)
+ ws2_32.lib;capstone.lib;%(AdditionalDependencies)
Console
+ $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib
diff --git a/vcpkg/install_vcpkg_dependencies.bat b/vcpkg/install_vcpkg_dependencies.bat
index 9ea72915..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 freetype glfw3 capstone[arm,arm64,x86]
+vcpkg\vcpkg.exe install --triplet x64-windows-static || exit /b 3
popd