diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 872b4d26..9aa0d9bb 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -11,8 +11,6 @@ SET(oracle_SOURCES src/main.cpp src/oraclewizard.cpp src/oracleimporter.cpp - src/zip/unzip.cpp - src/zip/zipglobal.cpp ../cockatrice/src/carddatabase.cpp ../cockatrice/src/settingscache.cpp ../cockatrice/src/qt-json/json.cpp @@ -121,6 +119,12 @@ FIND_PACKAGE(ZLIB) IF(ZLIB_FOUND) INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS}) ADD_DEFINITIONS("-DHAS_ZLIB") + + set(oracle_SOURCES ${oracle_SOURCES} + src/zip/unzip.cpp + src/zip/zipglobal.cpp + ) + ELSE() MESSAGE(STATUS "Oracle: zlib not found; ZIP support disabled") ENDIF() diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp index ac9dd28b..d50ae585 100644 --- a/oracle/src/oraclewizard.cpp +++ b/oracle/src/oraclewizard.cpp @@ -29,11 +29,12 @@ #include "main.h" #include "settingscache.h" +#define ZIP_SIGNATURE "PK" +#define ALLSETS_URL_FALLBACK "http://mtgjson.com/json/AllSets.json" + #ifdef HAS_ZLIB #include "zip/unzip.h" - #define ZIP_SIGNATURE "PK" #define ALLSETS_URL "http://mtgjson.com/json/AllSets.json.zip" - #define ALLSETS_URL_FALLBACK "http://mtgjson.com/json/AllSets.json" #else #define ALLSETS_URL "http://mtgjson.com/json/AllSets.json" #endif