mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-04 21:29:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
46385806b4
vcpkg/ports/tracy/001-fix-vcxproj-vcpkg.patch

189 lines
16 KiB
Diff
Raw Normal View History

[tracy] fix manifest mode build (#34874)
2023-11-18 06:56:52 +08:00
diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj
index be512f84..e810395a 100644
--- a/capture/build/win32/capture.vcxproj
+++ b/capture/build/win32/capture.vcxproj
@@ -57,12 +57,11 @@
<PreprocessorDefinitions>TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<LanguageStandard>stdcpplatest</LanguageStandard>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
- <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -77,14 +76,13 @@
<PreprocessorDefinitions>TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<LanguageStandard>stdcpplatest</LanguageStandard>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
- <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj
index b4adbf68..8715c883 100644
--- a/csvexport/build/win32/csvexport.vcxproj
+++ b/csvexport/build/win32/csvexport.vcxproj
@@ -57,12 +57,11 @@
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<LanguageStandard>stdcpplatest</LanguageStandard>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
- <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -77,14 +76,13 @@
<PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<LanguageStandard>stdcpplatest</LanguageStandard>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
- <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj
index 058a2aa3..86c0990b 100644
--- a/import-chrome/build/win32/import-chrome.vcxproj
+++ b/import-chrome/build/win32/import-chrome.vcxproj
@@ -57,12 +57,11 @@
<PreprocessorDefinitions>TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<LanguageStandard>stdcpplatest</LanguageStandard>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
- <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -77,14 +76,13 @@
<PreprocessorDefinitions>TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<LanguageStandard>stdcpplatest</LanguageStandard>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
- <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
[tracy] Add Tracy `profiler` and `capture` tools using project files (#24091) * [tracy] Add Tracy `profiler` and `capture` tools * [tracy] Linux supports * [capstone] fix non-installed pkg-config * [tracy] supports for capstone (including pkgconfig support) * [tracy] Add license * [tracy] fix OSX * [tracy] tools cannot be built on x86 Windows * [tracy] do not build tools by default * [tracy] Fix case * [tracy] fix vcpkg copyright location convention * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Finish code for code review suggestions * Use `vcpkg_build_make` instead of `vcpkg_execute_build_process` * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Workaround Windows cl complaint about `nodiscard` * Use tools bundle rather than individual tools in features * [capstone] Upgrade port after capstone-engine/capstone#1870 merge Co-authored-by: MACHIZAUD Andréa <andrea.machizaud@adobe.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-04-21 05:51:12 +08:00
diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj
[tracy] fix manifest mode build (#34874)
2023-11-18 06:56:52 +08:00
index 7b5d7cde..9a358b4d 100644
[tracy] Add Tracy `profiler` and `capture` tools using project files (#24091) * [tracy] Add Tracy `profiler` and `capture` tools * [tracy] Linux supports * [capstone] fix non-installed pkg-config * [tracy] supports for capstone (including pkgconfig support) * [tracy] Add license * [tracy] fix OSX * [tracy] tools cannot be built on x86 Windows * [tracy] do not build tools by default * [tracy] Fix case * [tracy] fix vcpkg copyright location convention * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Finish code for code review suggestions * Use `vcpkg_build_make` instead of `vcpkg_execute_build_process` * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Workaround Windows cl complaint about `nodiscard` * Use tools bundle rather than individual tools in features * [capstone] Upgrade port after capstone-engine/capstone#1870 merge Co-authored-by: MACHIZAUD Andréa <andrea.machizaud@adobe.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-04-21 05:51:12 +08:00
--- a/profiler/build/win32/Tracy.vcxproj
+++ b/profiler/build/win32/Tracy.vcxproj
[tracy] update to 0.8.2 (#26200) * [tracy] update to 0.8.2 * rever rename of capstone patch * add back newlines * update versions * revert removal of vcxproj patch * fixup vcxproj vcpkg patch * update git-tree hash
2022-08-19 01:44:46 +08:00
@@ -60,7 +60,7 @@
[tracy] Add Tracy `profiler` and `capture` tools using project files (#24091) * [tracy] Add Tracy `profiler` and `capture` tools * [tracy] Linux supports * [capstone] fix non-installed pkg-config * [tracy] supports for capstone (including pkgconfig support) * [tracy] Add license * [tracy] fix OSX * [tracy] tools cannot be built on x86 Windows * [tracy] do not build tools by default * [tracy] Fix case * [tracy] fix vcpkg copyright location convention * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Finish code for code review suggestions * Use `vcpkg_build_make` instead of `vcpkg_execute_build_process` * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Workaround Windows cl complaint about `nodiscard` * Use tools bundle rather than individual tools in features * [capstone] Upgrade port after capstone-engine/capstone#1870 merge Co-authored-by: MACHIZAUD Andréa <andrea.machizaud@adobe.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-04-21 05:51:12 +08:00
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
[tracy] update to 0.8.2 (#26200) * [tracy] update to 0.8.2 * rever rename of capstone patch * add back newlines * update versions * revert removal of vcxproj patch * fixup vcxproj vcpkg patch * update git-tree hash
2022-08-19 01:44:46 +08:00
- <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)</AdditionalIncludeDirectories>
[tracy] fix manifest mode build (#34874)
2023-11-18 06:56:52 +08:00
+ <AdditionalIncludeDirectories>..\..\..\imgui;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
[tracy] Add Tracy `profiler` and `capture` tools using project files (#24091) * [tracy] Add Tracy `profiler` and `capture` tools * [tracy] Linux supports * [capstone] fix non-installed pkg-config * [tracy] supports for capstone (including pkgconfig support) * [tracy] Add license * [tracy] fix OSX * [tracy] tools cannot be built on x86 Windows * [tracy] do not build tools by default * [tracy] Fix case * [tracy] fix vcpkg copyright location convention * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Finish code for code review suggestions * Use `vcpkg_build_make` instead of `vcpkg_execute_build_process` * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Workaround Windows cl complaint about `nodiscard` * Use tools bundle rather than individual tools in features * [capstone] Upgrade port after capstone-engine/capstone#1870 merge Co-authored-by: MACHIZAUD Andréa <andrea.machizaud@adobe.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-04-21 05:51:12 +08:00
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<ConformanceMode>true</ConformanceMode>
[tracy] update to 0.8.2 (#26200) * [tracy] update to 0.8.2 * rever rename of capstone patch * add back newlines * update versions * revert removal of vcxproj patch * fixup vcxproj vcpkg patch * update git-tree hash
2022-08-19 01:44:46 +08:00
@@ -70,9 +70,8 @@
[tracy] Add Tracy `profiler` and `capture` tools using project files (#24091) * [tracy] Add Tracy `profiler` and `capture` tools * [tracy] Linux supports * [capstone] fix non-installed pkg-config * [tracy] supports for capstone (including pkgconfig support) * [tracy] Add license * [tracy] fix OSX * [tracy] tools cannot be built on x86 Windows * [tracy] do not build tools by default * [tracy] Fix case * [tracy] fix vcpkg copyright location convention * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Finish code for code review suggestions * Use `vcpkg_build_make` instead of `vcpkg_execute_build_process` * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Workaround Windows cl complaint about `nodiscard` * Use tools bundle rather than individual tools in features * [capstone] Upgrade port after capstone-engine/capstone#1870 merge Co-authored-by: MACHIZAUD Andréa <andrea.machizaud@adobe.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-04-21 05:51:12 +08:00
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
[tracy] update to 0.10 (#34544)
2023-10-19 01:07:09 +08:00
- <AdditionalDependencies>brotlicommon.lib;brotlidec.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
[tracy] Add Tracy `profiler` and `capture` tools using project files (#24091) * [tracy] Add Tracy `profiler` and `capture` tools * [tracy] Linux supports * [capstone] fix non-installed pkg-config * [tracy] supports for capstone (including pkgconfig support) * [tracy] Add license * [tracy] fix OSX * [tracy] tools cannot be built on x86 Windows * [tracy] do not build tools by default * [tracy] Fix case * [tracy] fix vcpkg copyright location convention * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Finish code for code review suggestions * Use `vcpkg_build_make` instead of `vcpkg_execute_build_process` * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Workaround Windows cl complaint about `nodiscard` * Use tools bundle rather than individual tools in features * [capstone] Upgrade port after capstone-engine/capstone#1870 merge Co-authored-by: MACHIZAUD Andréa <andrea.machizaud@adobe.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-04-21 05:51:12 +08:00
+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
[tracy] update to 0.8.2 (#26200) * [tracy] update to 0.8.2 * rever rename of capstone patch * add back newlines * update versions * revert removal of vcxproj patch * fixup vcxproj vcpkg patch * update git-tree hash
2022-08-19 01:44:46 +08:00
- <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib</AdditionalLibraryDirectories>
[tracy] Add Tracy `profiler` and `capture` tools using project files (#24091) * [tracy] Add Tracy `profiler` and `capture` tools * [tracy] Linux supports * [capstone] fix non-installed pkg-config * [tracy] supports for capstone (including pkgconfig support) * [tracy] Add license * [tracy] fix OSX * [tracy] tools cannot be built on x86 Windows * [tracy] do not build tools by default * [tracy] Fix case * [tracy] fix vcpkg copyright location convention * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Finish code for code review suggestions * Use `vcpkg_build_make` instead of `vcpkg_execute_build_process` * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Workaround Windows cl complaint about `nodiscard` * Use tools bundle rather than individual tools in features * [capstone] Upgrade port after capstone-engine/capstone#1870 merge Co-authored-by: MACHIZAUD Andréa <andrea.machizaud@adobe.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-04-21 05:51:12 +08:00
</Link>
<Manifest>
<EnableDpiAwareness>true</EnableDpiAwareness>
[tracy] update to 0.8.2 (#26200) * [tracy] update to 0.8.2 * rever rename of capstone patch * add back newlines * update versions * revert removal of vcxproj patch * fixup vcxproj vcpkg patch * update git-tree hash
2022-08-19 01:44:46 +08:00
@@ -86,7 +85,7 @@
[tracy] Add Tracy `profiler` and `capture` tools using project files (#24091) * [tracy] Add Tracy `profiler` and `capture` tools * [tracy] Linux supports * [capstone] fix non-installed pkg-config * [tracy] supports for capstone (including pkgconfig support) * [tracy] Add license * [tracy] fix OSX * [tracy] tools cannot be built on x86 Windows * [tracy] do not build tools by default * [tracy] Fix case * [tracy] fix vcpkg copyright location convention * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Finish code for code review suggestions * Use `vcpkg_build_make` instead of `vcpkg_execute_build_process` * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Workaround Windows cl complaint about `nodiscard` * Use tools bundle rather than individual tools in features * [capstone] Upgrade port after capstone-engine/capstone#1870 merge Co-authored-by: MACHIZAUD Andréa <andrea.machizaud@adobe.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-04-21 05:51:12 +08:00
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
[tracy] update to 0.8.2 (#26200) * [tracy] update to 0.8.2 * rever rename of capstone patch * add back newlines * update versions * revert removal of vcxproj patch * fixup vcxproj vcpkg patch * update git-tree hash
2022-08-19 01:44:46 +08:00
- <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)</AdditionalIncludeDirectories>
[tracy] fix manifest mode build (#34874)
2023-11-18 06:56:52 +08:00
+ <AdditionalIncludeDirectories>..\..\..\imgui;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
[tracy] Add Tracy `profiler` and `capture` tools using project files (#24091) * [tracy] Add Tracy `profiler` and `capture` tools * [tracy] Linux supports * [capstone] fix non-installed pkg-config * [tracy] supports for capstone (including pkgconfig support) * [tracy] Add license * [tracy] fix OSX * [tracy] tools cannot be built on x86 Windows * [tracy] do not build tools by default * [tracy] Fix case * [tracy] fix vcpkg copyright location convention * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Finish code for code review suggestions * Use `vcpkg_build_make` instead of `vcpkg_execute_build_process` * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Workaround Windows cl complaint about `nodiscard` * Use tools bundle rather than individual tools in features * [capstone] Upgrade port after capstone-engine/capstone#1870 merge Co-authored-by: MACHIZAUD Andréa <andrea.machizaud@adobe.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-04-21 05:51:12 +08:00
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ConformanceMode>true</ConformanceMode>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
[tracy] update to 0.8.2 (#26200) * [tracy] update to 0.8.2 * rever rename of capstone patch * add back newlines * update versions * revert removal of vcxproj patch * fixup vcxproj vcpkg patch * update git-tree hash
2022-08-19 01:44:46 +08:00
@@ -97,9 +96,8 @@
[tracy] Add Tracy `profiler` and `capture` tools using project files (#24091) * [tracy] Add Tracy `profiler` and `capture` tools * [tracy] Linux supports * [capstone] fix non-installed pkg-config * [tracy] supports for capstone (including pkgconfig support) * [tracy] Add license * [tracy] fix OSX * [tracy] tools cannot be built on x86 Windows * [tracy] do not build tools by default * [tracy] Fix case * [tracy] fix vcpkg copyright location convention * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Finish code for code review suggestions * Use `vcpkg_build_make` instead of `vcpkg_execute_build_process` * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Workaround Windows cl complaint about `nodiscard` * Use tools bundle rather than individual tools in features * [capstone] Upgrade port after capstone-engine/capstone#1870 merge Co-authored-by: MACHIZAUD Andréa <andrea.machizaud@adobe.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-04-21 05:51:12 +08:00
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
[tracy] update to 0.10 (#34544)
2023-10-19 01:07:09 +08:00
- <AdditionalDependencies>brotlicommon.lib;brotlidec.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
[tracy] Add Tracy `profiler` and `capture` tools using project files (#24091) * [tracy] Add Tracy `profiler` and `capture` tools * [tracy] Linux supports * [capstone] fix non-installed pkg-config * [tracy] supports for capstone (including pkgconfig support) * [tracy] Add license * [tracy] fix OSX * [tracy] tools cannot be built on x86 Windows * [tracy] do not build tools by default * [tracy] Fix case * [tracy] fix vcpkg copyright location convention * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Finish code for code review suggestions * Use `vcpkg_build_make` instead of `vcpkg_execute_build_process` * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Workaround Windows cl complaint about `nodiscard` * Use tools bundle rather than individual tools in features * [capstone] Upgrade port after capstone-engine/capstone#1870 merge Co-authored-by: MACHIZAUD Andréa <andrea.machizaud@adobe.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-04-21 05:51:12 +08:00
+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
[tracy] update to 0.8.2 (#26200) * [tracy] update to 0.8.2 * rever rename of capstone patch * add back newlines * update versions * revert removal of vcxproj patch * fixup vcxproj vcpkg patch * update git-tree hash
2022-08-19 01:44:46 +08:00
- <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib</AdditionalLibraryDirectories>
[tracy] Add Tracy `profiler` and `capture` tools using project files (#24091) * [tracy] Add Tracy `profiler` and `capture` tools * [tracy] Linux supports * [capstone] fix non-installed pkg-config * [tracy] supports for capstone (including pkgconfig support) * [tracy] Add license * [tracy] fix OSX * [tracy] tools cannot be built on x86 Windows * [tracy] do not build tools by default * [tracy] Fix case * [tracy] fix vcpkg copyright location convention * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Finish code for code review suggestions * Use `vcpkg_build_make` instead of `vcpkg_execute_build_process` * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Workaround Windows cl complaint about `nodiscard` * Use tools bundle rather than individual tools in features * [capstone] Upgrade port after capstone-engine/capstone#1870 merge Co-authored-by: MACHIZAUD Andréa <andrea.machizaud@adobe.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-04-21 05:51:12 +08:00
</Link>
<Manifest>
<EnableDpiAwareness>true</EnableDpiAwareness>
[tracy] fix manifest mode build (#34874)
2023-11-18 06:56:52 +08:00
diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj
index 55f0e55e..cbdf8c35 100644
--- a/update/build/win32/update.vcxproj
+++ b/update/build/win32/update.vcxproj
@@ -57,12 +57,11 @@
<PreprocessorDefinitions>TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<LanguageStandard>stdcpplatest</LanguageStandard>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
- <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -77,14 +76,13 @@
<PreprocessorDefinitions>TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<LanguageStandard>stdcpplatest</LanguageStandard>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
- <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Reference in New Issue Copy Permalink