Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
e8cb2607
Commit
e8cb2607
authored
Feb 13, 2015
by
Fabio Bas
Browse files
Fix win32 compilation without zlib
parent
12fe0f53
Changes
2
Hide whitespace changes
Inline
Side-by-side
oracle/CMakeLists.txt
View file @
e8cb2607
...
@@ -11,8 +11,6 @@ SET(oracle_SOURCES
...
@@ -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)
...
@@ -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
()
...
...
oracle/src/oraclewizard.cpp
View file @
e8cb2607
...
@@ -29,11 +29,12 @@
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment