aboutsummaryrefslogtreecommitdiffstats
path: root/common/zlib
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2011-03-03 09:25:56 +0000
committerPierre Ossman <ossman@cendio.se>2011-03-03 09:25:56 +0000
commitc21ddafe5d2bbcdfc8b30d9c2cfb3f261a321cce (patch)
treefc0cb55af91aafde198131f2f552647e3e1fc279 /common/zlib
parent0c9dddcf4b6ecd23630db8d3c3f58c26b1dca07f (diff)
downloadtigervnc-c21ddafe5d2bbcdfc8b30d9c2cfb3f261a321cce.tar.gz
tigervnc-c21ddafe5d2bbcdfc8b30d9c2cfb3f261a321cce.zip
We're trying to use CMake for every arch, so make sure the Windows specific
flag is conditional. Also remove the -DWINDOWS as it is unnecessary (zlib checks WIN32 as well in all relevant cases). git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4312 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/zlib')
-rw-r--r--common/zlib/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/common/zlib/CMakeLists.txt b/common/zlib/CMakeLists.txt
index 3f1db1b8..69f1c9f9 100644
--- a/common/zlib/CMakeLists.txt
+++ b/common/zlib/CMakeLists.txt
@@ -1,4 +1,8 @@
-add_definitions(-DNO_VIZ -DWINDOWS)
+# It seems like gcc for Win32 doesn't support the visibility attribute,
+# so disable it to make it stop complaining.
+if(WIN32)
+ add_definitions(-DNO_VIZ)
+endif()
add_library(zlib STATIC
adler32.c