mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 14:19:46 -06:00
Externals: update xxhash to 0.8.2 as submodule; put in logic to ensure LZ4 which is also using xxhash does not clash when linking symbols
This commit is contained in:
2
Externals/lz4/CMakeLists.txt
vendored
2
Externals/lz4/CMakeLists.txt
vendored
@ -10,4 +10,4 @@ add_subdirectory(lz4/build/cmake)
|
||||
|
||||
dolphin_disable_warnings_msvc(lz4_static)
|
||||
add_library(LZ4::LZ4 ALIAS lz4_static)
|
||||
|
||||
target_compile_definitions(lz4_static PRIVATE XXH_NAMESPACE=LZ4_)
|
||||
|
5
Externals/lz4/LZ4.vcxproj
vendored
5
Externals/lz4/LZ4.vcxproj
vendored
@ -15,6 +15,11 @@
|
||||
<Import Project="$(VSPropsDir)ClDisableAllWarnings.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>XXH_NAMESPACE=LZ4_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="lz4\lib\lz4.h" />
|
||||
<ClInclude Include="lz4\lib\lz4frame.h" />
|
||||
|
Reference in New Issue
Block a user