FEX-Emu/FEX
1
0
Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2024-11-23 14:40:14 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update xxhash to v0.8.2

Browse Source 
Switches to using upstream cmake files.
This commit is contained in:
Ryan Houdek 2024-02-26 23:29:14 -08:00
parent 8c0d5c6583
commit 78a362581d
No known key found for this signature in database
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -41,7 +41,7 @@
url = https://github.com/FEX-Emu/drm-headers.git url = https://github.com/FEX-Emu/drm-headers.git
[submodule "External/xxhash"] [submodule "External/xxhash"]
path = External/xxhash path = External/xxhash
url = https://github.com/FEX-Emu/xxHash.git url = https://github.com/Cyan4973/xxHash.git
[submodule "External/Catch2"] [submodule "External/Catch2"]
path = External/Catch2 path = External/Catch2
url = https://github.com/catchorg/Catch2.git url = https://github.com/catchorg/Catch2.git

6
CMakeLists.txt
View File

@ -237,8 +237,10 @@ endif()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
find_package(Python 3.0 REQUIRED COMPONENTS Interpreter) find_package(Python 3.0 REQUIRED COMPONENTS Interpreter)
add_subdirectory(External/xxhash/) set(XXHASH_BUNDLED_MODE TRUE)
include_directories(External/xxhash/) set(XXHASH_BUILD_XXHSUM FALSE)
set(BUILD_SHARED_LIBS OFF)
add_subdirectory(External/xxhash/cmake_unofficial/)
add_definitions(-Wno-trigraphs) add_definitions(-Wno-trigraphs)
add_definitions(-DGLOBAL_DATA_DIRECTORY="${DATA_DIRECTORY}/") add_definitions(-DGLOBAL_DATA_DIRECTORY="${DATA_DIRECTORY}/")

2
External/xxhash vendored

@ -1 +1 @@
Subproject commit ba7375d54fbbf7bfd9519b465a146e9a8bf0240f Subproject commit bbb27a5efb85b92a0486cf361a8635715a53f6ba

2
FEXCore/Source/CMakeLists.txt
View File

@ -194,7 +194,7 @@ endif()
# Some defines for the softfloat library # Some defines for the softfloat library
list(APPEND DEFINES "-DSOFTFLOAT_BUILTIN_CLZ") list(APPEND DEFINES "-DSOFTFLOAT_BUILTIN_CLZ")
set (LIBS fmt::fmt vixl xxhash FEXHeaderUtils) set (LIBS fmt::fmt vixl xxHash::xxhash FEXHeaderUtils)
if (NOT MINGW_BUILD) if (NOT MINGW_BUILD)
list (APPEND LIBS dl) list (APPEND LIBS dl)

2
Source/Tools/FEXRootFSFetcher/CMakeLists.txt
View File

@ -3,7 +3,7 @@ set(SRCS Main.cpp
XXFileHash.cpp) XXFileHash.cpp)
add_executable(${NAME} ${SRCS}) add_executable(${NAME} ${SRCS})
list(APPEND LIBS FEXCore Common) list(APPEND LIBS FEXCore Common xxHash::xxhash)
target_include_directories(${NAME} PRIVATE ${CMAKE_SOURCE_DIR}/Source/) target_include_directories(${NAME} PRIVATE ${CMAKE_SOURCE_DIR}/Source/)