Revision: 4282
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4282&view=rev
Author: dcommander
Date: 2011-02-10 10:43:05 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
Fix MinGW build breakage
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/common/rdr/CMakeLists.txt
trunk/config.h.cmake.in
trunk/win/CMakeLists.txt
trunk/win/vncviewer/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2011-02-10 04:19:46 UTC (rev 4281)
+++ trunk/CMakeLists.txt 2011-02-10 10:43:05 UTC (rev 4282)
@@ -110,6 +110,8 @@
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR})
+add_definitions(-D_WIN32_IE=0x0500 -D_WIN32_WINNT=0x0500)
+
add_subdirectory(common)
add_subdirectory(win)
Modified: trunk/common/rdr/CMakeLists.txt
===================================================================
--- trunk/common/rdr/CMakeLists.txt 2011-02-10 04:19:46 UTC (rev 4281)
+++ trunk/common/rdr/CMakeLists.txt 2011-02-10 10:43:05 UTC (rev 4282)
@@ -16,7 +16,7 @@
set(RDR_LIBRARIES zlib os)
if(GNUTLS_FOUND)
- set(RDR_LIBRARIES ${RDR_LIBRARIES} ${GNUTLS_LIBRARIES})
+ set(RDR_LIBRARIES ${RDR_LIBRARIES} ${GNUTLS_LIBRARIES} ws2_32)
endif()
target_link_libraries(rdr ${RDR_LIBRARIES})
Modified: trunk/config.h.cmake.in
===================================================================
--- trunk/config.h.cmake.in 2011-02-10 04:19:46 UTC (rev 4281)
+++ trunk/config.h.cmake.in 2011-02-10 10:43:05 UTC (rev 4282)
@@ -6,6 +6,6 @@
#cmakedefine HAVE_VSNPRINTF
/* MS Visual Studio 2008 and newer doesn't know ssize_t */
-#if defined(HAVE_GNUTLS) && defined(WIN32)
-#define ssize_t long
+#if defined(HAVE_GNUTLS) && defined(WIN32) && !defined(__MINGW32__)
+typedef size_t ssize_t;
#endif
Modified: trunk/win/CMakeLists.txt
===================================================================
--- trunk/win/CMakeLists.txt 2011-02-10 04:19:46 UTC (rev 4281)
+++ trunk/win/CMakeLists.txt 2011-02-10 10:43:05 UTC (rev 4282)
@@ -1,5 +1,3 @@
-add_definitions(-D_WIN32_IE=0x0500 -D_WIN32_WINNT=0x0500)
-
include_directories(${CMAKE_SOURCE_DIR}/common ${CMAKE_SOURCE_DIR}/win)
configure_file(resdefs.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/resdefs.h)
Modified: trunk/win/vncviewer/CMakeLists.txt
===================================================================
--- trunk/win/vncviewer/CMakeLists.txt 2011-02-10 04:19:46 UTC (rev 4281)
+++ trunk/win/vncviewer/CMakeLists.txt 2011-02-10 10:43:05 UTC (rev 4282)
@@ -20,9 +20,17 @@
vncviewer.cxx
vncviewer.rc)
-target_link_libraries(vncviewer rfb rfb_win32 Xregion network rdr
- ws2_32.lib)
+set(VNCVIEWER_LIBRARIES rfb rfb_win32 Xregion network rdr)
+# 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)
+ set(VNCVIEWER_LIBRARIES ${VNCVIEWER_LIBRARIES} ws2_32)
+endif()
+
+target_link_libraries(vncviewer ${VNCVIEWER_LIBRARIES})
+
install(TARGETS vncviewer
RUNTIME DESTINATION .
)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
