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: Add Vcpkg manifest + MSBuild integration --- capture/build/win32/capture.vcxproj | 3 +++ 1 file changed, 3 insertions(+) (limited to 'capture') 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 -- cgit v1.2.3 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: Update vcxproj vcpkg path --- capture/build/win32/capture.vcxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'capture') 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 -- cgit v1.2.3 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: Fix weird path ? --- capture/build/win32/capture.vcxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'capture') 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 -- cgit v1.2.3 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: Remove superfluous vcxproj setup thanks to vcpkg integration --- capture/build/win32/capture.vcxproj | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'capture') 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 -- cgit v1.2.3 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: Inject appropriate path for manifest install --- capture/build/win32/capture.vcxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'capture') 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 -- cgit v1.2.3