Replace ZLib With A Submodules (v3.0)

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
           - name: Install Dependencies
             run: |
                 sudo apt-get update
-                sudo apt-get install --no-install-recommends -y build-essential cmake ninja-build libopenal-dev libsdl2-dev
+                sudo apt-get install --no-install-recommends -y build-essential cmake ninja-build libopenal-dev libsdl2-dev libpng-dev zlib1g-dev
           - name: Build Desktop
             run: |
                 cd platforms/sdl

.gitmodules

@@ -1,6 +1,9 @@
 [submodule "thirdparty/coi-serviceworker"]
 	path = thirdparty/coi-serviceworker
-	url = https://github.com/gzuidhof/coi-serviceworker
+	url = https://github.com/gzuidhof/coi-serviceworker.git
 [submodule "thirdparty/gles-compatibility-layer"]
 	path = thirdparty/gles-compatibility-layer
 	url = https://github.com/TheBrokenRail/gles-compatibility-layer.git
+[submodule "thirdparty/zlib"]
+	path = thirdparty/zlib
+	url = https://github.com/madler/zlib.git

platforms/sdl/CMakeLists.txt

@@ -49,6 +49,7 @@ target_link_libraries(reminecraftpe reminecraftpe-openal)
 
 # LibPNG (If Needed)
 if(NOT EMSCRIPTEN)
+    # System LibPNG
     find_package(PNG REQUIRED)
     target_link_libraries(reminecraftpe PNG::PNG)
 endif()

source/CMakeLists.txt

@@ -240,16 +240,28 @@ add_subdirectory(../thirdparty/raknet raknet)
 target_link_libraries(reminecraftpe-core PUBLIC raknet)
 
 # zlib
-add_subdirectory(../thirdparty/zlib zlib)
+add_library(zlib INTERFACE)
+if(EMSCRIPTEN)
+    # Use Emscripten's ZLib
+    set(ZLIB_FLAG -sUSE_ZLIB=1)
+    target_compile_options(zlib INTERFACE "${ZLIB_FLAG}")
+    target_link_options(zlib INTERFACE "${ZLIB_FLAG}")
+else()
+    # Use System ZLib
+    find_package(ZLIB REQUIRED)
+    target_link_libraries(zlib INTERFACE ZLIB::ZLIB)
+endif()
 target_link_libraries(reminecraftpe-core PUBLIC zlib)
 
 # SDL
 add_library(SDL INTERFACE)
 if(EMSCRIPTEN)
+    # Use Emscripten's SDL2
     set(SDL_FLAG -sUSE_SDL=2)
     target_compile_options(SDL INTERFACE "${SDL_FLAG}")
     target_link_options(SDL INTERFACE "${SDL_FLAG}")
 else()
+    # Use System SDL2
     find_package(SDL2 REQUIRED)
     target_link_libraries(SDL INTERFACE SDL2::SDL2)
 endif()