aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Åstrand (astrand) <astrand@cendio.se>2018-09-19 15:18:25 +0200
committerPeter Åstrand (astrand) <astrand@cendio.se>2018-09-19 15:18:25 +0200
commit97eeefd7713bd649541405388e010709546ec206 (patch)
tree68d623365c89e967b1a690408a8a80fc962dae0b
parent6d0a5a267b5b4c45a97f3e60db7d28785c5ec1ee (diff)
downloadtigervnc-97eeefd7713bd649541405388e010709546ec206.tar.gz
tigervnc-97eeefd7713bd649541405388e010709546ec206.zip
Link zlib statically on all platforms
The API and ABI isn't as stable as we need, so it isn't safe to link it dynamically even on Linux.
-rw-r--r--cmake/StaticBuild.cmake5
1 files changed, 1 insertions, 4 deletions
diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake
index 4b58b1de..a9943098 100644
--- a/cmake/StaticBuild.cmake
+++ b/cmake/StaticBuild.cmake
@@ -19,10 +19,7 @@ if(BUILD_STATIC)
set(BUILD_STATIC_GCC 1)
set(JPEG_LIBRARIES "-Wl,-Bstatic -ljpeg -Wl,-Bdynamic")
-
- if(WIN32)
- set(ZLIB_LIBRARIES "-Wl,-Bstatic -lz -Wl,-Bdynamic")
- endif()
+ set(ZLIB_LIBRARIES "-Wl,-Bstatic -lz -Wl,-Bdynamic")
# gettext is included in libc on many unix systems
if(NOT LIBC_HAS_DGETTEXT)