[mt972] Rename compress.c to compress_zlib.c Build projects that incl…

…ude bzip2 and zlib has conflicts like StormLib due to same name files, at least under VS. So rename it to bypass the trouble and use only one copy of Zlib for all projects.
mangosR2 · May 4, 2014 · c9a77ca · c9a77ca
1 parent 1772504
commit c9a77ca
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/contrib/mmap/CMakeLists.txt b/contrib/mmap/CMakeLists.txt
@@ -34,7 +34,7 @@ include_directories(
 
 add_library(zlib
     ../../dep/src/zlib/adler32.c
-    ../../dep/src/zlib/compress.c
+    ../../dep/src/zlib/compress_zlib.c
     ../../dep/src/zlib/crc32.c
     ../../dep/src/zlib/deflate.c
     ../../dep/src/zlib/example.c

diff --git a/dep/StormLib/CMakeLists.txt b/dep/StormLib/CMakeLists.txt
@@ -226,7 +226,7 @@ set(ZLIB_BZIP2_FILES
            ../src/bzip2/huffman.c
            ../src/bzip2/randtable.c
            ../src/zlib/adler32.c
-           ../src/zlib/compress.c
+           ../src/zlib/compress_zlib.c
            ../src/zlib/crc32.c
            ../src/zlib/deflate.c
            ../src/zlib/inffast.c

diff --git a/dep/src/zlib/CMakeLists.txt b/dep/src/zlib/CMakeLists.txt
@@ -18,7 +18,7 @@
 
 set(zlib_SRCS
   adler32.c
-  compress.c
+  compress_zlib.c
   crc32.c
   deflate.c
   example.c

diff --git a/dep/src/zlib/compress.c → dep/src/zlib/compress_zlib.c b/dep/src/zlib/compress.c → dep/src/zlib/compress_zlib.c
diff --git a/src/shared/revision_R2.h b/src/shared/revision_R2.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_R2_H__
 #define __REVISION_R2_H__
- #define REVISION_R2 "971"
+ #define REVISION_R2 "972"
 #endif // __REVISION_R2_H__