diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-03-16 21:56:27 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-03-16 21:56:27 +0100 |
| commit | 02f82e96945b47e71e90bf78402e5fc69cb326c7 (patch) | |
| tree | 4f14aac84d9f19e1904b5b62384583058ac296b1 | |
| parent | 405833bbbe943e3bb9180af088913ce0d0d1f878 (diff) | |
| download | MultiMC-02f82e96945b47e71e90bf78402e5fc69cb326c7.tar MultiMC-02f82e96945b47e71e90bf78402e5fc69cb326c7.tar.gz MultiMC-02f82e96945b47e71e90bf78402e5fc69cb326c7.tar.lz MultiMC-02f82e96945b47e71e90bf78402e5fc69cb326c7.tar.xz MultiMC-02f82e96945b47e71e90bf78402e5fc69cb326c7.zip | |
NOISSUE Z_PREFIX for QuaZip
| -rw-r--r-- | quazip.patch | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/quazip.patch b/quazip.patch index ff263d25..bbd0bb1e 100644 --- a/quazip.patch +++ b/quazip.patch @@ -12,7 +12,7 @@ Index: quazip/CMakeLists.txt =================================================================== --- quazip/CMakeLists.txt (revision 250) +++ quazip/CMakeLists.txt (working copy) -@@ -14,10 +14,11 @@ +@@ -14,10 +14,14 @@ qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) set(SRCS ${SRCS} ${MOC_SRCS}) @@ -24,6 +24,9 @@ Index: quazip/CMakeLists.txt -target_link_libraries(quazip ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARIES}) +target_link_libraries(quazip ${ZLIB_LIBRARIES}) +qt5_use_modules(quazip Core) ++if(WIN32) ++ add_definitions(-DZ_PREFIX) ++endif() install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip) install(TARGETS quazip LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) |