Revision: 8451
http://playerstage.svn.sourceforge.net/playerstage/?rev=8451&view=rev
Author: gbiggs
Date: 2009-12-06 00:23:27 +0000 (Sun, 06 Dec 2009)
Log Message:
-----------
Fixes for compiling on Windows, part 2: Make it work with pykg-config.
Modified Paths:
--------------
code/player/trunk/cmake/internal/DriverUtils.cmake
code/player/trunk/server/CMakeLists.txt
Modified: code/player/trunk/cmake/internal/DriverUtils.cmake
===================================================================
--- code/player/trunk/cmake/internal/DriverUtils.cmake 2009-12-05 15:31:59 UTC
(rev 8450)
+++ code/player/trunk/cmake/internal/DriverUtils.cmake 2009-12-06 00:23:27 UTC
(rev 8451)
@@ -198,8 +198,8 @@
SET (${_includeDirs} ${${_pkgVar}_INCLUDE_DIRS})
SET (${_libDirs} ${${_pkgVar}_LIBRARY_DIRS})
SET (${_linkLibs} ${${_pkgVar}_LIBRARIES})
- LIST_TO_STRING (${_cFlags} "${${_pkgVar}_CFLAGS}")
- LIST_TO_STRING (${_linkFlags} "${${_pkgVar}_LDFLAGS}")
+ LIST_TO_STRING (${_cFlags} "${${_pkgVar}_CFLAGS_OTHER}")
+ LIST_TO_STRING (${_linkFlags} "${${_pkgVar}_LDFLAGS_OTHER}")
ELSEIF (${_cumulativeVar})
# Case where cumulativeVar is set but package wasn't found - don't
build
SET (${_cumulativeVar} FALSE)
Modified: code/player/trunk/server/CMakeLists.txt
===================================================================
--- code/player/trunk/server/CMakeLists.txt 2009-12-05 15:31:59 UTC (rev
8450)
+++ code/player/trunk/server/CMakeLists.txt 2009-12-06 00:23:27 UTC (rev
8451)
@@ -24,6 +24,16 @@
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/replace)
SET (playerreplaceLib playerreplace)
ENDIF (NOT HAVE_GETOPT)
+# On Windows, player.exe also needs to link to the same libs as
+# playerdrivers.dll. The libs seem to get added by CMake automatically, but
+# the directories have to be done manually.
+IF (PLAYER_OS_WIN)
+ IF (PLAYER_DRIVERSLIB_LIBDIRS)
+ FILTER_EMPTY (driverLinkDirs "${PLAYER_DRIVERSLIB_LIBDIRS}")
+ FILTER_DUPLICATES (driverLinkDirs "${driverLinkDirs}")
+ LINK_DIRECTORIES (${driverLinkDirs})
+ ENDIF (PLAYER_DRIVERSLIB_LIBDIRS)
+ENDIF (PLAYER_OS_WIN)
# Source files
SET (playerSrcs server.cc)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
