diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 97ff786c..032c9265 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,7 @@ find_package(ZLIB REQUIRED) # Add quazip add_subdirectory(quazip) -include_directories(quazip) +include_directories(quazip ${ZLIB_INCLUDE_DIRS}) # Add bspatch add_subdirectory(patchlib) @@ -157,6 +157,10 @@ configure_file("${PROJECT_SOURCE_DIR}/config.h.in" "${PROJECT_BINARY_DIR}/include/config.h") +######## Other Stuff ######## + +ADD_DEFINITIONS(-DQUAZIP_STATIC) + ################################ FILES ################################ ######## Headers ######## @@ -172,6 +176,7 @@ gui/aboutdialog.h gui/consolewindow.h gui/instancemodel.h gui/instancedelegate.h +gui/versionselectdialog.h gui/iconcache.h multimc_pragma.h @@ -201,6 +206,7 @@ gui/aboutdialog.cpp gui/consolewindow.cpp gui/instancemodel.cpp gui/instancedelegate.cpp +gui/versionselectdialog.cpp gui/iconcache.cpp java/javautils.cpp @@ -219,6 +225,7 @@ gui/taskdialog.ui gui/browserdialog.ui gui/aboutdialog.ui gui/consolewindow.ui +gui/versionselectdialog.ui ) @@ -257,7 +264,7 @@ ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32 # Link QT5_USE_MODULES(MultiMC Widgets Network WebKitWidgets) -TARGET_LINK_LIBRARIES(MultiMC quazip patchlib +TARGET_LINK_LIBRARIES(MultiMC quazip patchlib libUtil libSettings libMultiMC libGroupView ${MultiMC_LINK_ADDITIONAL_LIBS}) ADD_DEPENDENCIES(MultiMC MultiMCLauncher libUtil libSettings libMultiMC libGroupView) |