diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-28 18:43:30 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-28 18:43:30 +0200 |
| commit | d267d86f6e24c4f947c30c1a3642d57b82f8addd (patch) | |
| tree | a0c0cc7ced7f8d38ea5c12108ded83c762fba2f9 /CMakeLists.txt | |
| parent | d903b0f0ea4bbeb6a20771575295ea28795dc5d7 (diff) | |
| download | MultiMC-d267d86f6e24c4f947c30c1a3642d57b82f8addd.tar MultiMC-d267d86f6e24c4f947c30c1a3642d57b82f8addd.tar.gz MultiMC-d267d86f6e24c4f947c30c1a3642d57b82f8addd.tar.lz MultiMC-d267d86f6e24c4f947c30c1a3642d57b82f8addd.tar.xz MultiMC-d267d86f6e24c4f947c30c1a3642d57b82f8addd.zip | |
Replace lzma with xz. Tweaks to fix debug builds.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index de8ca8b5..bb813a09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,13 +47,15 @@ include_directories(${Qt5Widgets_INCLUDE_DIRS}) add_subdirectory(depends/quazip) include_directories(depends/quazip) -# Add lzma -#add_subdirectory(depends/lzma) -#include_directories(depends/lzma/include) - # Add the java launcher add_subdirectory(depends/launcher) +# Add xz decompression +add_subdirectory(depends/xz-embedded) + +# Add pack200 decompression +add_subdirectory(depends/pack200) + ######## MultiMC Libs ######## # Add the util library. @@ -68,9 +70,6 @@ include_directories(${LIBSETTINGS_INCLUDE_DIR}) add_subdirectory(depends/groupview) include_directories(${LIBGROUPVIEW_INCLUDE_DIR}) -#pack 200 -#add_subdirectory(depends/pack200) - ################################ SET UP BUILD OPTIONS ################################ ######## Check endianness ######## @@ -355,9 +354,8 @@ ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32 # Link QT5_USE_MODULES(MultiMC Widgets Network Xml) -TARGET_LINK_LIBRARIES(MultiMC quazip lzma libUtil libSettings libGroupView -${MultiMC_LINK_ADDITIONAL_LIBS}) -#ADD_DEPENDENCIES(MultiMC MultiMCLauncher libUtil libSettings libGroupView) +TARGET_LINK_LIBRARIES(MultiMC quazip libUtil libSettings libGroupView ${MultiMC_LINK_ADDITIONAL_LIBS}) +ADD_DEPENDENCIES(MultiMC MultiMCLauncher) option(BUILD_KEYRING_TEST "Build the simple keyring test binary" OFF) |