From 5c8def4eccc3ca591e8a94e57d9b9ead2cb2c381 Mon Sep 17 00:00:00 2001 From: hyperfang8 Date: Sat, 28 Sep 2013 11:00:34 +0200 Subject: [PATCH] Disable pack200 and Enable MultiMCLauncher dep I disable pack200 in cmake because it fails to compile. I also renable MultiMCLauncher dep because resource file requires it. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ffa04b88..78087e16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,7 @@ add_subdirectory(depends/groupview) include_directories(${LIBGROUPVIEW_INCLUDE_DIR}) #pack 200 -add_subdirectory(depends/pack200) +#add_subdirectory(depends/pack200) ################################ SET UP BUILD OPTIONS ################################ @@ -358,7 +358,7 @@ 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) - +ADD_DEPENDENCIES(MultiMC MultiMCLauncher) option(BUILD_KEYRING_TEST "Build the simple keyring test binary" OFF) IF(BUILD_KEYRING_TEST)