Compare commits

...

2 commits

Author SHA1 Message Date
niansa
6febb82917 Link LLVM in dynarmic statically 2024-03-12 22:45:45 +01:00
niansa
b76ad05a53 Link to LLVM statically 2024-03-12 21:03:19 +00:00
3 changed files with 12 additions and 5 deletions

7
.gitmodules vendored
View file

@ -7,9 +7,6 @@
[submodule "cubeb"]
path = externals/cubeb
url = https://github.com/mozilla/cubeb.git
[submodule "dynarmic"]
path = externals/dynarmic
url = https://gitlab.com/suyu-emu/dynarmic.git
[submodule "libusb"]
path = externals/libusb/libusb
url = https://github.com/libusb/libusb.git
@ -67,3 +64,7 @@
[submodule "Vulkan-Utility-Libraries"]
path = externals/Vulkan-Utility-Libraries
url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git
[submodule "externals/dynarmic"]
path = externals/dynarmic
url = https://gitlab.com/suyu-emu/dynarmic.git
branch = stable

2
externals/dynarmic vendored

@ -1 +1 @@
Subproject commit ba8192d89078af51ae6f97c9352e3683612cdff1
Subproject commit f35a122a4654d9f7edc32e0b44ad09f17819ae6d

View file

@ -254,8 +254,14 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
)
endif()
function (target_link_static_library TARGET MODE LIBRARY)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
target_link_libraries(${TARGET} ${MODE} ${LIBRARY})
endfunction()
target_link_libraries(common PUBLIC Boost::context Boost::headers fmt::fmt microprofile stb::headers Threads::Threads)
target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd LLVM::Demangle)
target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd)
target_link_static_library(common PRIVATE LLVM::Demangle)
if (ANDROID)
# For ASharedMemory_create