diff options
| author | Andrew <forkk@forkk.net> | 2013-04-01 12:04:40 -0500 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-04-01 12:04:40 -0500 |
| commit | 276cfb18a680407ca39feaaf860d4c6ee6015213 (patch) | |
| tree | b1637108085027f59ac2143c7b034d8739319507 /CMakeLists.txt | |
| parent | ebb2c54975e3f0b7b891532e8e72d2ef760f96c4 (diff) | |
| download | MultiMC-276cfb18a680407ca39feaaf860d4c6ee6015213.tar MultiMC-276cfb18a680407ca39feaaf860d4c6ee6015213.tar.gz MultiMC-276cfb18a680407ca39feaaf860d4c6ee6015213.tar.lz MultiMC-276cfb18a680407ca39feaaf860d4c6ee6015213.tar.xz MultiMC-276cfb18a680407ca39feaaf860d4c6ee6015213.zip | |
Fix quazip issues.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c3744430..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 ######## @@ -260,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) |