0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix quazip issues.

Browse Source
This commit is contained in:
Andrew 2013-04-01 12:04:40 -05:00
parent ebb2c54975
commit 276cfb18a6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -47,7 +47,7 @@ find_package(ZLIB REQUIRED)
# Add quazip # Add quazip
add_subdirectory(quazip) add_subdirectory(quazip)
include_directories(quazip) include_directories(quazip ${ZLIB_INCLUDE_DIRS})
# Add bspatch # Add bspatch
add_subdirectory(patchlib) add_subdirectory(patchlib)
@ -157,6 +157,10 @@ configure_file("${PROJECT_SOURCE_DIR}/config.h.in"
"${PROJECT_BINARY_DIR}/include/config.h") "${PROJECT_BINARY_DIR}/include/config.h")
######## Other Stuff ########
ADD_DEFINITIONS(-DQUAZIP_STATIC)
################################ FILES ################################ ################################ FILES ################################
######## Headers ######## ######## Headers ########

6
quazip/CMakeLists.txt
View File

@ -1,3 +1,5 @@
project(quazip)
# set all include directories for in and out of source builds # set all include directories for in and out of source builds
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
@ -11,8 +13,8 @@ include_directories(
file(GLOB SRCS "*.c" "*.cpp") file(GLOB SRCS "*.c" "*.cpp")
file(GLOB PUBLIC_HEADERS "*.h") file(GLOB PUBLIC_HEADERS "*.h")
# Must be added to enable export macro # Static link!
ADD_DEFINITIONS(-DQUAZIP_BUILD) ADD_DEFINITIONS(-DQUAZIP_STATIC)
#qt5_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) #qt5_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS})
#set(SRCS ${SRCS} ${MOC_SRCS}) #set(SRCS ${SRCS} ${MOC_SRCS})