Remove zlib headers form build under Linux,*BSD and macOS.

Remove zlib headers form build under Linux,*BSD,macOS. Update README.md
tx00100xt · Dec 10, 2023 · 7540a2e · 7540a2e
1 parent f7697fb
commit 7540a2e
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -396,6 +396,8 @@ License
 * Serious Engine is licensed under the GNU GPL v2 (see LICENSE file).
 * amp11lib is licensed under the GNU GPL v2 (see amp11lib/COPYING file).
 
+### Note:
+The following applies only to the for Windows build. Because none of the following is used when building under (Linux, *BSD, macOS) systems.
 Some of the code included with the engine sources is not licensed under the GNU GPL v2:
 
 * zlib (located in `Sources/Engine/zlib`) by Jean-loup Gailly and Mark Adler

diff --git a/SamTFE/Sources/CMakeLists.txt b/SamTFE/Sources/CMakeLists.txt
@@ -62,6 +62,8 @@ if(USE_SYSTEM_ZLIB)
     else()
         message(FATAL_ERROR "Error! USE_SYSTEM_ZLIB is set but neccessary developer files are missing")
     endif()
+else()
+    add_definitions(-DSE1_ZLIB=1)
 endif()
 
 option(USE_ASM "Use ASM code" TRUE)

diff --git a/SamTFE/Sources/Engine/Base/Unzip.cpp b/SamTFE/Sources/Engine/Base/Unzip.cpp
@@ -32,7 +32,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 typedef unsigned char Byte;  // !!! FIXME:  not sure why I suddenly needed this typedef here.
 #endif
 
+#ifdef PLATFORM_UNIX && !SE1_ZLIB
+#include <zlib.h>
+#else
 #include <Engine/zlib/zlib.h>
+#endif
 extern CTCriticalSection zip_csLock; // critical section for access to zlib functions
 
 #pragma pack(1)

diff --git a/SamTFE/Sources/Engine/Network/Compression.cpp b/SamTFE/Sources/Engine/Network/Compression.cpp
@@ -18,7 +18,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <Engine/Base/Stream.h>
 #include <Engine/Network/Compression.h>
 #include <Engine/Base/Synchronization.h>
+
+#ifdef PLATFORM_UNIX && !SE1_ZLIB
+#include <zlib.h>
+#else
 #include <Engine/zlib/zlib.h>
+#endif
 
 extern CTCriticalSection zip_csLock; // critical section for access to zlib functions
 

diff --git a/SamTSE/Sources/CMakeLists.txt b/SamTSE/Sources/CMakeLists.txt
@@ -62,6 +62,16 @@ if(USE_SYSTEM_ZLIB)
     else()
         message(FATAL_ERROR "Error! USE_SYSTEM_ZLIB is set but neccessary developer files are missing")
     endif()
+else()
+    add_definitions(-DSE1_ZLIB=1)
+endif()
+
+option(USE_ASM "Use ASM code" TRUE)
+if (USE_ASM)
+    MESSAGE(STATUS "Using assembler code (when available)")
+else()
+    add_definitions(-DUSE_PORTABLE_C=1)
+    MESSAGE(STATUS "Using portable C instead of all ASM")
 endif()
 
 ################################################################
@@ -107,14 +117,6 @@ else()
  message(STATUS "Building Serious Sam Classic The Second Encounter")
 endif()
 
-option(USE_ASM "Use ASM code" TRUE)
-if (USE_ASM)
-    MESSAGE(STATUS "Using assembler code (when available)")
-else()
-    add_definitions(-DUSE_PORTABLE_C=1)
-    MESSAGE(STATUS "Using portable C instead of all ASM")
-endif()
-
 ###############################################################
 ###############################################################
 ###############################################################

diff --git a/SamTSE/Sources/Engine/Base/Unzip.cpp b/SamTSE/Sources/Engine/Base/Unzip.cpp
@@ -32,7 +32,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 typedef unsigned char Byte;  // !!! FIXME:  not sure why I suddenly needed this typedef here.
 #endif
 
+#ifdef PLATFORM_UNIX && !SE1_ZLIB
+#include <zlib.h>
+#else
 #include <Engine/zlib/zlib.h>
+#endif
 extern CTCriticalSection zip_csLock; // critical section for access to zlib functions
 
 #pragma pack(1)

diff --git a/SamTSE/Sources/Engine/Network/Compression.cpp b/SamTSE/Sources/Engine/Network/Compression.cpp
@@ -18,7 +18,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <Engine/Base/Stream.h>
 #include <Engine/Network/Compression.h>
 #include <Engine/Base/Synchronization.h>
+
+#ifdef PLATFORM_UNIX && !SE1_ZLIB
+#include <zlib.h>
+#else
 #include <Engine/zlib/zlib.h>
+#endif
 
 extern CTCriticalSection zip_csLock; // critical section for access to zlib functions
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,8 @@ if(USE_SYSTEM_ZLIB) @@
         else()
             message(FATAL_ERROR "Error! USE_SYSTEM_ZLIB is set but neccessary developer files are missing")
         endif()
+    else()
+        add_definitions(-DSE1_ZLIB=1)
     endif()
     option(USE_ASM "Use ASM code" TRUE)
@@ Expand Down @@