From: Peter Åstrand <astrand@cendio.se>
Date: Mon, 27 Aug 2012 08:12:47 +0000 (+0000)
Subject: Reverted last patch which was a mistake.
X-Git-Tag: v1.2.90~110
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=13ee3219270604774486f3f28f4c46ea090d143b;p=tigervnc.git

Reverted last patch which was a mistake.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4975 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt
index 4348b85d..c1facc67 100644
--- a/vncviewer/CMakeLists.txt
+++ b/vncviewer/CMakeLists.txt
@@ -45,53 +45,13 @@ else()
   add_executable(vncviewer ${VNCVIEWER_SOURCES})
 endif()
 
+target_link_libraries(vncviewer rfb network rdr os Xregion ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})
 
-# XXX: Cendio hack
-#target_link_libraries(vncviewer rfb network rdr os Xregion ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})
-#
-## When building with GnuTLS, librdr depends on ws2_32, so in order to make
-## MinGW happy, we need to put ws2_32 in librdr's target_link_libraries string,
-## not here.
-#if(NOT GNUTLS_FOUND AND WIN32)
-#  target_link_libraries(vncviewer ws2_32)
-#endif()
-
-target_link_libraries(vncviewer -nodefaultlibs rfb network rdr os Xregion)
-
-if(APPLE)
-  target_link_libraries(vncviewer "-framework Carbon" "-framework Cocoa" "-framework ApplicationServices")
-endif()
-
-if(UNIX AND NOT APPLE)
-  # Needed to load icon files
-  target_link_libraries(vncviewer -Wl,-Bstatic ${FLTK_IMAGES_LIBRARY} png -Wl,-Bdynamic)
-endif()
-
-target_link_libraries(vncviewer -Wl,-Bstatic ${FLTK_BASE_LIBRARY} -Wl,-Bdynamic)
-
-if(WIN32)
-  target_link_libraries(vncviewer -Wl,-Bstatic ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} -Wl,-Bdynamic)
-elseif(APPLE)
-  target_link_libraries(vncviewer -Wl,-Bstatic ${GETTEXT_LIBRARIES} -Wl,-Bdynamic ${ICONV_LIBRARIES})
-else()
-  if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-    # XXX: Cendio hack: Add rpath to find libXfixes on Solaris without LD_LIBRARY_PATH.
-    # XXX: Cendio hack: libXft is broken on at least our servers
-    # XXX: Cendio hack: In theory, we must add freetype. However, in practice this does not work, since it is not found,
-    # since it's in /usr/sparc-sun-solaris2.10/sys-root/usr/sfw/lib/. It works if we DONT specify it, though. 
-    target_link_libraries(vncviewer ${X11_Xcursor_LIB} ${X11_Xfixes_LIB} /usr/sparc-sun-solaris2.10/sys-root/usr/X11/lib/libXinerama.so -Wl,-Bstatic Xft -Wl,-Bdynamic fontconfig Xext -R/usr/sfw/lib)
-  else()
-    target_link_libraries(vncviewer -Wl,-Bstatic ${X11_Xcursor_LIB} ${X11_Xfixes_LIB} Xft fontconfig expat freetype Xrender Xext Xinerama -Wl,-Bdynamic)
-  endif()
-  target_link_libraries(vncviewer X11 m )
-endif()
-
-target_link_libraries(vncviewer libstdc++.a gcc gcc_eh)
-
-if(WIN32)
-  target_link_libraries(vncviewer ws2_32 comctl32 mingw32 moldname mingwex msvcrt kernel32 gcc)
-else()
-  target_link_libraries(vncviewer c)
+# When building with GnuTLS, librdr depends on ws2_32, so in order to make
+# MinGW happy, we need to put ws2_32 in librdr's target_link_libraries string,
+# not here.
+if(NOT GNUTLS_FOUND AND WIN32)
+  target_link_libraries(vncviewer ws2_32)
 endif()
 
 install(TARGETS vncviewer DESTINATION ${BIN_DIR})