diff options
| author | Vicent Marti <tanoku@gmail.com> | 2011-07-01 17:34:27 +0200 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2011-07-01 17:34:27 +0200 |
| commit | ec62685345654cba50f3985c4ca44ce0e641d83c (patch) | |
| tree | 4ec20a90a9a6ae562403adf37e7547f6c52f1469 | |
| parent | 17d523041df6247c21160cb19fa0e783ae40e43c (diff) | |
| download | libgit2-ec62685345654cba50f3985c4ca44ce0e641d83c.tar.gz | |
zlib: Declare preprocessor directives at build time
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | deps/zlib/zconf.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 42f81a772..4a7117b2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,7 @@ IF (WIN32 AND NOT CYGWIN) FILE(GLOB SRC src/*.c src/win32/*.c) ENDIF () -ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64) +ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 -DNO_VIZ -DSTDC -DNO_GZIP) # Compile and link libgit2 ADD_LIBRARY(git2 ${SRC} ${SRC_ZLIB}) diff --git a/deps/zlib/zconf.h b/deps/zlib/zconf.h index 683cba88b..150814361 100644 --- a/deps/zlib/zconf.h +++ b/deps/zlib/zconf.h @@ -10,10 +10,6 @@ #include "../../src/common.h" -#define NO_GZIP -#define STDC -#define NO_VIZ - /* Jeez, don't complain about non-prototype * forms, we didn't write zlib */ #if defined(_MSC_VER) |