[WIN32][Qt] Fix FTBFS with ZLIB.

diff --git a/source/build-cmake/cmake/config_sharedlibs.cmake b/source/build-cmake/cmake/config_sharedlibs.cmake
index ff415d6..9959d3a 100644 (file)
--- a/source/build-cmake/cmake/config_sharedlibs.cmake
+++ b/source/build-cmake/cmake/config_sharedlibs.cmake
@@ -62,6 +62,7 @@ if(USE_GCC_OLD_ABI)
 else()
   add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
 endif()
+
 include(FindZLIB)
 if(ZLIB_FOUND)
   add_definitions(-DUSE_ZLIB)

diff --git a/source/src/fileio.cpp b/source/src/fileio.cpp
index cc150a0..ca33b6b 100644 (file)
--- a/source/src/fileio.cpp
+++ b/source/src/fileio.cpp
@@ -35,13 +35,13 @@
 #endif
 
 #ifdef USE_ZLIB
-       #ifdef _WIN32
-               #define ZLIB_WINAPI
-       #endif
        #if defined(USE_QT)
                #include <zlib.h>
                #include <zconf.h>
        #else
+               #ifdef _WIN32
+                       #define ZLIB_WINAPI
+               #endif
                #include "zlib-1.2.11/zlib.h"
                #include "zlib-1.2.11/zconf.h"
        #endif

diff --git a/source/src/qt/emuutils/CMakeLists.txt b/source/src/qt/emuutils/CMakeLists.txt
index acacc90..2793b23 100644 (file)
--- a/source/src/qt/emuutils/CMakeLists.txt
+++ b/source/src/qt/emuutils/CMakeLists.txt
@@ -19,7 +19,7 @@ add_library(CSPemu_utils SHARED
 
 target_link_libraries(CSPemu_utils PUBLIC
                Qt5::Core
-               -lz
+               libz.a
          )
 set_target_properties(CSPemu_utils PROPERTIES
                             SOVERSION 2.4.0