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 | |
| 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.
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | quazip/CMakeLists.txt | 6 |
2 files changed, 10 insertions, 4 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) diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt index b245653f..b5a391e9 100644 --- a/quazip/CMakeLists.txt +++ b/quazip/CMakeLists.txt @@ -1,3 +1,5 @@ +project(quazip) + # set all include directories for in and out of source builds include_directories( ${CMAKE_CURRENT_SOURCE_DIR} @@ -11,8 +13,8 @@ include_directories( file(GLOB SRCS "*.c" "*.cpp") file(GLOB PUBLIC_HEADERS "*.h") -# Must be added to enable export macro -ADD_DEFINITIONS(-DQUAZIP_BUILD) +# Static link! +ADD_DEFINITIONS(-DQUAZIP_STATIC) #qt5_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) #set(SRCS ${SRCS} ${MOC_SRCS}) |