From 2173abb9a87c67b53e64c9bdebbba5fa6b4d4b7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 28 Sep 2013 18:27:34 +0200 Subject: [PATCH] Fix stuff up some more --- CMakeLists.txt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0537f4619..1a056a081 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,10 +47,6 @@ 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) @@ -68,9 +64,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 +348,7 @@ 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)