BUILD: Refactor zlib submodule (#10393)

3rdparty/CMakeLists.txt

@@ -7,21 +7,7 @@ add_library(3rdparty_dummy_lib INTERFACE)
 
 
 # ZLib
-if (USE_SYSTEM_ZLIB)
-	find_package(ZLIB QUIET)
-endif()
-
-if (NOT ZLIB_FOUND)
-	message(STATUS "Using builtin ZLIB")
-	set(SKIP_INSTALL_ALL ON)
-	add_subdirectory(zlib EXCLUDE_FROM_ALL)
-	set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zlib" "${CMAKE_CURRENT_BINARY_DIR}/zlib")
-	set(ZLIB_LIBRARY zlibstatic)
-endif()
-
-add_library(3rdparty_zlib INTERFACE)
-target_link_libraries(3rdparty_zlib INTERFACE ${ZLIB_LIBRARY})
-target_include_directories(3rdparty_zlib INTERFACE ${ZLIB_INCLUDE_DIR})
+add_subdirectory(zlib EXCLUDE_FROM_ALL)
 
 # 7z sdk
 add_subdirectory(7z EXCLUDE_FROM_ALL)

3rdparty/libpng/libpng.vcxproj

@@ -15,7 +15,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>libpng</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\3rdparty\zlib.props" />
+  <Import Project="$(SolutionDir)\3rdparty\zlib\zlib.props" />
   <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />

3rdparty/libpng/pnglibconf.vcxproj

@@ -19,7 +19,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\3rdparty\zlib.props" />
+  <Import Project="$(SolutionDir)\3rdparty\zlib\zlib.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>

3rdparty/zlib/CMakeLists.txt

@@ -0,0 +1,14 @@
+if (USE_SYSTEM_ZLIB)
+    message(STATUS "-- RPCS3: Using syztem ZLIB")
+    find_package(ZLIB QUIET)
+else()
+	message(STATUS "-- RPCS3: Using builtin ZLIB")
+	set(SKIP_INSTALL_ALL ON)
+	add_subdirectory(zlib EXCLUDE_FROM_ALL)
+	set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zlib" "${CMAKE_CURRENT_BINARY_DIR}/zlib")
+	set(ZLIB_LIBRARY zlibstatic)
+endif()
+
+add_library(3rdparty_zlib INTERFACE)
+target_link_libraries(3rdparty_zlib INTERFACE ${ZLIB_LIBRARY})
+target_include_directories(3rdparty_zlib INTERFACE ${ZLIB_INCLUDE_DIR})

3rdparty/zlib/zlib.props

@@ -32,7 +32,7 @@
 	 versions do not match.  The zlib version used in this build is recorded
 	 below:
      -->
-    <ZLibSrcDir>$(SolutionDir)3rdparty\zlib\</ZLibSrcDir>
+    <ZLibSrcDir>$(SolutionDir)3rdparty\zlib\zlib\</ZLibSrcDir>
 
     <!-- The following line allows compilation for an ARM target with Visual
          Studio 2012.  Notice that this is not supported by the Visual Studio

3rdparty/zlib/zlib.vcxproj

@@ -28,7 +28,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>zlib</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\3rdparty\zlib.props" />
+  <Import Project="$(SolutionDir)\3rdparty\zlib\zlib.props" />
   <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup>