diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-28 18:27:34 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-28 18:27:34 +0200 |
| commit | 2173abb9a87c67b53e64c9bdebbba5fa6b4d4b7d (patch) | |
| tree | 071d3d4f490302a48abac81c8fb4c3dfd5bef064 | |
| parent | 071ac459256a135759fd53d601d649c722e0e902 (diff) | |
| download | MultiMC-2173abb9a87c67b53e64c9bdebbba5fa6b4d4b7d.tar MultiMC-2173abb9a87c67b53e64c9bdebbba5fa6b4d4b7d.tar.gz MultiMC-2173abb9a87c67b53e64c9bdebbba5fa6b4d4b7d.tar.lz MultiMC-2173abb9a87c67b53e64c9bdebbba5fa6b4d4b7d.tar.xz MultiMC-2173abb9a87c67b53e64c9bdebbba5fa6b4d4b7d.zip | |
Fix stuff up some more
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0537f461..1a056a08 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) |