Revision: 6727
http://playerstage.svn.sourceforge.net/playerstage/?rev=6727&view=rev
Author: gbiggs
Date: 2008-07-01 20:58:53 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
Some work to make Player compile on QNX and Solaris
Modified Paths:
--------------
code/player/trunk/cmake/internal/SearchForStuff.cmake
code/player/trunk/libplayercore/CMakeLists.txt
code/player/trunk/libplayersd/CMakeLists.txt
code/player/trunk/server/libplayerdrivers/CMakeLists.txt
Modified: code/player/trunk/cmake/internal/SearchForStuff.cmake
===================================================================
--- code/player/trunk/cmake/internal/SearchForStuff.cmake 2008-07-02
03:25:30 UTC (rev 6726)
+++ code/player/trunk/cmake/internal/SearchForStuff.cmake 2008-07-02
03:58:53 UTC (rev 6727)
@@ -4,9 +4,16 @@
INCLUDE (CheckIncludeFiles)
INCLUDE (CheckLibraryExists)
+IF (PLAYER_OS_QNX)
+ SET (CMAKE_REQUIRED_LIBRARIES socket)
+ELSEIF (PLAYER_OS_SOLARIS)
+ SET (CMAKE_REQUIRED_LIBRARIES socket nsl)
+ENDIF (PLAYER_OS_QNX)
+CHECK_FUNCTION_EXISTS (getaddrinfo HAVE_GETADDRINFO)
+SET (CMAKE_REQUIRED_LIBRARIES)
+
CHECK_FUNCTION_EXISTS (cfmakeraw HAVE_CFMAKERAW)
CHECK_FUNCTION_EXISTS (dirname HAVE_DIRNAME)
-CHECK_FUNCTION_EXISTS (getaddrinfo HAVE_GETADDRINFO)
CHECK_LIBRARY_EXISTS (ltdl lt_dlopenext "" HAVE_LIBLTDL)
CHECK_INCLUDE_FILES (linux/joystick.h HAVE_LINUX_JOYSTICK_H)
CHECK_FUNCTION_EXISTS (poll HAVE_POLL)
@@ -83,3 +90,9 @@
LIST_TO_STRING (GDKPIXBUF_CFLAGS "${GDKPIXBUF_PKG_CFLAGS}")
ENDIF (GDKPIXBUF_PKG_FOUND)
ENDIF (NOT PKG_CONFIG_FOUND)
+
+IF (PLAYER_OS_QNX)
+ SET (PTHREAD_LIB)
+ELSE (PLAYER_OS_QNX)
+ SET (PTHREAD_LIB -lpthread)
+ENDIF (PLAYER_OS_QNX)
Modified: code/player/trunk/libplayercore/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayercore/CMakeLists.txt 2008-07-02 03:25:30 UTC
(rev 6726)
+++ code/player/trunk/libplayercore/CMakeLists.txt 2008-07-02 03:58:53 UTC
(rev 6727)
@@ -62,20 +62,30 @@
# playerxdr and used here. Those functions should go into a separate
# library.
SET (coreLibs playerutils playererror playerxdr pthread)
-SET (corePCLibs "-lpthread")
-PLAYER_ADD_LINK_LIB (pthread)
+IF (PLAYER_OS_QNX)
+ SET (corePCLibs)
+ELSE (PLAYER_OS_QNX)
+ SET (corePCLibs "-lpthread")
+ PLAYER_ADD_LINK_LIB (pthread)
+ENDIF (NOT PLAYER_OS_QNX)
IF (HAVE_CLOCK_GETTIME)
- SET (coreLibs ${coreLibs} rt)
- SET (corePCLibs "${corePCLibs} -lrt")
- PLAYER_ADD_LINK_LIB (rt)
+ SET (coreLibs ${coreLibs} rt)
+ SET (corePCLibs "${corePCLibs} -lrt")
+ PLAYER_ADD_LINK_LIB (rt)
ELSE (HAVE_CLOCK_GETTIME)
- SET (playercoreSrcs ${playercoreSrcs}
${PROJECT_SOURCE_DIR}/replace/clock_gettime.c)
+ SET (playercoreSrcs ${playercoreSrcs}
${PROJECT_SOURCE_DIR}/replace/clock_gettime.c)
ENDIF (HAVE_CLOCK_GETTIME)
IF (HAVE_LIBLTDL)
- SET (coreLibs ${coreLibs} ltdl dl)
- SET (corePCLibs "${corePCLibs} -lltdl -dl")
- PLAYER_ADD_LINK_LIB (ltdl dl)
+ IF (PLAYER_OS_QNX)
+ SET (coreLibs ${coreLibs} ltdl)
+ SET (corePCLibs "${corePCLibs} -lltdl")
+ PLAYER_ADD_LINK_LIB (ltdl)
+ ELSE (PLAYER_OS_QNX)
+ SET (coreLibs ${coreLibs} ltdl dl)
+ SET (corePCLibs "${corePCLibs} -lltdl -ldl")
+ PLAYER_ADD_LINK_LIB (ltdl dl)
+ ENDIF (PLAYER_OS_QNX)
ENDIF (HAVE_LIBLTDL)
IF (NOT HAVE_DIRNAME)
SET (playercoreSrcs ${playercoreSrcs}
${PROJECT_SOURCE_DIR}/replace/dirname.c)
Modified: code/player/trunk/libplayersd/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayersd/CMakeLists.txt 2008-07-02 03:25:30 UTC
(rev 6726)
+++ code/player/trunk/libplayersd/CMakeLists.txt 2008-07-02 03:58:53 UTC
(rev 6727)
@@ -8,7 +8,7 @@
PLAYER_ADD_LIBRARY (playersd ${playersdSrcs})
TARGET_LINK_LIBRARIES (playersd playererror playerutils)
PLAYER_ADD_LINK_LIB (dns_sd)
- PLAYER_MAKE_PKGCONFIG ("playersd" "Player service discovery library - part
of the Player Project" "playererror playerutils" "" "" "-ldns_sd -lpthread")
+ PLAYER_MAKE_PKGCONFIG ("playersd" "Player service discovery library - part
of the Player Project" "playererror playerutils" "" "" "-ldns_sd
${PTHREAD_LIB}")
PLAYER_INSTALL_HEADERS (playersd playersd.h)
ENDIF (HAVE_PLAYERSD)
\ No newline at end of file
Modified: code/player/trunk/server/libplayerdrivers/CMakeLists.txt
===================================================================
--- code/player/trunk/server/libplayerdrivers/CMakeLists.txt 2008-07-02
03:25:30 UTC (rev 6726)
+++ code/player/trunk/server/libplayerdrivers/CMakeLists.txt 2008-07-02
03:58:53 UTC (rev 6727)
@@ -91,6 +91,6 @@
ENDIF (PLAYER_DRIVERSLIB_LINKFLAGS)
# Package config file for libplayerdrivers
-PLAYER_MAKE_PKGCONFIG ("playerdrivers" "Player driver library - part of the
Player Project" "playercore" "" "" "-lpthread")
+PLAYER_MAKE_PKGCONFIG ("playerdrivers" "Player driver library - part of the
Player Project" "playercore" "" "" "${PTHREAD_LIB}")
PLAYER_INSTALL_HEADERS (playerdrivers driverregistry.h)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
