mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-12-30 21:15:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix stuff up some more

Browse Source
This commit is contained in:
Petr Mrázek 2013-09-28 18:27:34 +02:00
parent 071ac45925
commit 2173abb9a8
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -47,10 +47,6 @@ include_directories(${Qt5Widgets_INCLUDE_DIRS})
add_subdirectory(depends/quazip) add_subdirectory(depends/quazip)
include_directories(depends/quazip) include_directories(depends/quazip)
# Add lzma
#add_subdirectory(depends/lzma)
#include_directories(depends/lzma/include)
# Add the java launcher # Add the java launcher
add_subdirectory(depends/launcher) add_subdirectory(depends/launcher)
@ -68,9 +64,6 @@ include_directories(${LIBSETTINGS_INCLUDE_DIR})
add_subdirectory(depends/groupview) add_subdirectory(depends/groupview)
include_directories(${LIBGROUPVIEW_INCLUDE_DIR}) include_directories(${LIBGROUPVIEW_INCLUDE_DIR})
#pack 200
#add_subdirectory(depends/pack200)
################################ SET UP BUILD OPTIONS ################################ ################################ SET UP BUILD OPTIONS ################################
######## Check endianness ######## ######## Check endianness ########
@ -355,9 +348,7 @@ ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32
# Link # Link
QT5_USE_MODULES(MultiMC Widgets Network Xml) QT5_USE_MODULES(MultiMC Widgets Network Xml)
TARGET_LINK_LIBRARIES(MultiMC quazip lzma libUtil libSettings libGroupView TARGET_LINK_LIBRARIES(MultiMC quazip libUtil libSettings libGroupView ${MultiMC_LINK_ADDITIONAL_LIBS})
${MultiMC_LINK_ADDITIONAL_LIBS})
#ADD_DEPENDENCIES(MultiMC MultiMCLauncher libUtil libSettings libGroupView)
ADD_DEPENDENCIES(MultiMC MultiMCLauncher) ADD_DEPENDENCIES(MultiMC MultiMCLauncher)
option(BUILD_KEYRING_TEST "Build the simple keyring test binary" OFF) option(BUILD_KEYRING_TEST "Build the simple keyring test binary" OFF)