summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2017-09-24 17:04:55 +0200
committerbunnei <bunneidev@gmail.com>2017-09-30 20:30:04 +0200
commit9eb4888df7fc7e02e364622878f332fc103ca919 (patch)
tree07ee94850124402f0feaa06870ec8cf77da9ef1e
parentmemory: Log with 64-bit values. (diff)
downloadyuzu-9eb4888df7fc7e02e364622878f332fc103ca919.tar
yuzu-9eb4888df7fc7e02e364622878f332fc103ca919.tar.gz
yuzu-9eb4888df7fc7e02e364622878f332fc103ca919.tar.bz2
yuzu-9eb4888df7fc7e02e364622878f332fc103ca919.tar.lz
yuzu-9eb4888df7fc7e02e364622878f332fc103ca919.tar.xz
yuzu-9eb4888df7fc7e02e364622878f332fc103ca919.tar.zst
yuzu-9eb4888df7fc7e02e364622878f332fc103ca919.zip
-rw-r--r--externals/CMakeLists.txt5
m---------externals/lz40
-rw-r--r--src/core/CMakeLists.txt2
3 files changed, 6 insertions, 1 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 8e4bcf21f..b809d76d8 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -28,6 +28,11 @@ add_subdirectory(glad)
# inih
add_subdirectory(inih)
+# lz4
+set(LZ4_BUNDLED_MODE ON)
+add_subdirectory(lz4/contrib/cmake_unofficial)
+target_include_directories(lz4_static INTERFACE ./lz4/lib)
+
# MicroProfile
add_library(microprofile INTERFACE)
target_include_directories(microprofile INTERFACE ./microprofile)
diff --git a/externals/lz4 b/externals/lz4
new file mode 160000
+Subproject c10863b98e1503af90616ae99725ecd120265df
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 360f407f3..44d7f670b 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -389,7 +389,7 @@ set(HEADERS
create_directory_groups(${SRCS} ${HEADERS})
add_library(core STATIC ${SRCS} ${HEADERS})
target_link_libraries(core PUBLIC common PRIVATE audio_core video_core)
-target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp dynarmic fmt)
+target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp dynarmic fmt lz4_static)
if (ENABLE_WEB_SERVICE)
target_link_libraries(core PUBLIC json-headers web_service)
endif()