aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix win32 compilation without zlib

Browse source
This commit is contained in:
Fabio Bas 2015-02-13 16:58:55 +01:00
parent 12fe0f5380
commit e8cb260734
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
oracle/CMakeLists.txt
View file

@ -11,8 +11,6 @@ SET(oracle_SOURCES
src/main.cpp src/main.cpp
src/oraclewizard.cpp src/oraclewizard.cpp
src/oracleimporter.cpp src/oracleimporter.cpp
src/zip/unzip.cpp
src/zip/zipglobal.cpp
../cockatrice/src/carddatabase.cpp ../cockatrice/src/carddatabase.cpp
../cockatrice/src/settingscache.cpp ../cockatrice/src/settingscache.cpp
../cockatrice/src/qt-json/json.cpp ../cockatrice/src/qt-json/json.cpp
@ -121,6 +119,12 @@ FIND_PACKAGE(ZLIB)
IF(ZLIB_FOUND) IF(ZLIB_FOUND)
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
ADD_DEFINITIONS("-DHAS_ZLIB") ADD_DEFINITIONS("-DHAS_ZLIB")
set(oracle_SOURCES ${oracle_SOURCES}
src/zip/unzip.cpp
src/zip/zipglobal.cpp
)
ELSE() ELSE()
MESSAGE(STATUS "Oracle: zlib not found; ZIP support disabled") MESSAGE(STATUS "Oracle: zlib not found; ZIP support disabled")
ENDIF() ENDIF()

5
oracle/src/oraclewizard.cpp
View file

@ -29,11 +29,12 @@
#include "main.h" #include "main.h"
#include "settingscache.h" #include "settingscache.h"
#define ZIP_SIGNATURE "PK"
#define ALLSETS_URL_FALLBACK "http://mtgjson.com/json/AllSets.json"
#ifdef HAS_ZLIB #ifdef HAS_ZLIB
#include "zip/unzip.h" #include "zip/unzip.h"
#define ZIP_SIGNATURE "PK"
#define ALLSETS_URL "http://mtgjson.com/json/AllSets.json.zip" #define ALLSETS_URL "http://mtgjson.com/json/AllSets.json.zip"
#define ALLSETS_URL_FALLBACK "http://mtgjson.com/json/AllSets.json"
#else #else
#define ALLSETS_URL "http://mtgjson.com/json/AllSets.json" #define ALLSETS_URL "http://mtgjson.com/json/AllSets.json"
#endif #endif