Fix stuff up some more
This commit is contained in:
parent
071ac45925
commit
2173abb9a8
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user