Menu
▾
▴
[Playerstage-commit] SF.net SVN: playerstage: [6592] code/player/trunk
|
From: <ge...@us...> - 2008-06-16 14:51:03
|
Revision: 6592
http://playerstage.svn.sourceforge.net/playerstage/?rev=6592&view=rev
Author: gerkey
Date: 2008-06-16 14:51:08 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
reworked replace file usage
Modified Paths:
--------------
code/player/trunk/CMakeLists.txt
code/player/trunk/client_libs/libplayerc/CMakeLists.txt
code/player/trunk/libplayercore/CMakeLists.txt
code/player/trunk/libplayertcp/CMakeLists.txt
code/player/trunk/server/CMakeLists.txt
code/player/trunk/server/libplayerdrivers/CMakeLists.txt
Removed Paths:
-------------
code/player/trunk/replace/CMakeLists.txt
code/player/trunk/replace/dummy.c
Modified: code/player/trunk/CMakeLists.txt
===================================================================
--- code/player/trunk/CMakeLists.txt 2008-06-16 21:20:10 UTC (rev 6591)
+++ code/player/trunk/CMakeLists.txt 2008-06-16 21:51:08 UTC (rev 6592)
@@ -58,7 +58,6 @@
ADD_SUBDIRECTORY (libplayertcp)
ADD_SUBDIRECTORY (libplayersd)
ADD_SUBDIRECTORY (rtk2)
- ADD_SUBDIRECTORY (replace)
ADD_SUBDIRECTORY (server)
ADD_SUBDIRECTORY (examples)
ADD_SUBDIRECTORY (utils)
Modified: code/player/trunk/client_libs/libplayerc/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc/CMakeLists.txt 2008-06-16 21:20:10 UTC (rev 6591)
+++ code/player/trunk/client_libs/libplayerc/CMakeLists.txt 2008-06-16 21:51:08 UTC (rev 6592)
@@ -49,6 +49,9 @@
dev_vectormap.c
dev_wifi.c
dev_wsn.c)
+IF(NOT HAVE_POLL)
+ SET(playercSrcs ${playercSrcs} ../../replace/poll.c)
+ENDIF(NOT HAVE_POLL)
APPEND_TO_CACHED_LIST (PLAYERC_EXTRA_LINK_LIBRARIES "Libs to link to with playerc" z m)
PLAYER_ADD_LIBRARY (playerc ${playercSrcs})
@@ -69,4 +72,4 @@
PLAYER_INSTALL_HEADERS (playerc playerc.h)
-PLAYER_MAKE_PKGCONFIG ("playerc" "Andrew Howard's Player C client library - part of the Player Project" "playerxdr playererror" "" "" "-lm")
\ No newline at end of file
+PLAYER_MAKE_PKGCONFIG ("playerc" "Andrew Howard's Player C client library - part of the Player Project" "playerxdr playererror" "" "" "-lm")
Modified: code/player/trunk/libplayercore/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayercore/CMakeLists.txt 2008-06-16 21:20:10 UTC (rev 6591)
+++ code/player/trunk/libplayercore/CMakeLists.txt 2008-06-16 21:51:08 UTC (rev 6592)
@@ -50,7 +50,7 @@
# from the fact that message cloning functions are auto-generated into
# playerxdr and used here. Those functions should go into a separate
# library.
-SET(CORESRCS driver.cc
+SET(playercore_srcs driver.cc
device.cc
drivertable.cc
devicetable.cc
@@ -69,15 +69,17 @@
SET(CORE_PC_LIBS "${CORE_PC_LIBS} -lrt")
PLAYER_ADD_LINK_LIB (rt)
ELSE(HAVE_CLOCK_GETTIME)
- SET(CORESRCS ${CORESRCS} ../replace/clock_gettime.c)
+ SET(playercore_srcs ${playercore_srcs} ../replace/clock_gettime.c)
ENDIF(HAVE_CLOCK_GETTIME)
IF(HAVE_LIBLTDL)
SET(CORELIBS ${CORELIBS} ltdl dl)
SET(CORE_PC_LIBS "${CORE_PC_LIBS} -lltdl -dl")
PLAYER_ADD_LINK_LIB (ltdl dl)
ENDIF(HAVE_LIBLTDL)
+IF(NOT HAVE_DIRNAME)
+ SET(playercore_srcs ${playercore_srcs} ../replace/dirname.c)
+ENDIF(NOT HAVE_DIRNAME)
-SET (playercore_srcs ${CORESRCS})
PLAYER_ADD_LIBRARY (playercore ${playercore_srcs} ${player_interfaces_h} ${playerxdr_h})
TARGET_LINK_LIBRARIES(playercore ${CORELIBS})
Modified: code/player/trunk/libplayertcp/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayertcp/CMakeLists.txt 2008-06-16 21:20:10 UTC (rev 6591)
+++ code/player/trunk/libplayertcp/CMakeLists.txt 2008-06-16 21:51:08 UTC (rev 6592)
@@ -7,8 +7,14 @@
OPTION (ENABLE_TCP_NODELAY "Turn off Nagel's buffering algorithm (which may increase socket latency when used)" OFF)
SET (playertcpSrcs socket_util.c playertcp.cc remote_driver.cc)
+ IF(NOT HAVE_POLL)
+ SET(playertcpSrcs ${playertcpSrcs} ../replace/poll.c)
+ ENDIF(NOT HAVE_POLL)
+ IF(NOT HAVE_COMPRESSBOUND)
+ SET(playertcpSrcs ${playertcpSrcs} ../replace/compressBound.c)
+ ENDIF(NOT HAVE_COMPRESSBOUND)
PLAYER_ADD_LIBRARY (playertcp ${playertcpSrcs})
- TARGET_LINK_LIBRARIES (playertcp replace playercore playererror playerutils playerxdr)
+ TARGET_LINK_LIBRARIES (playertcp playercore playererror playerutils playerxdr)
IF (HAVE_Z)
TARGET_LINK_LIBRARIES (playertcp z)
PLAYER_ADD_LINK_LIB (z)
@@ -20,8 +26,14 @@
IF (INCLUDE_UDP)
SET (playerudpSrcs playerudp.cc)
+ IF(NOT HAVE_POLL)
+ SET(playerudpSrcs ${playerudpSrcs} ../replace/poll.c)
+ ENDIF(NOT HAVE_POLL)
+ IF(NOT HAVE_COMPRESSBOUND)
+ SET(playerudpSrcs ${playerudpSrcs} ../replace/compressBound.c)
+ ENDIF(NOT HAVE_COMPRESSBOUND)
PLAYER_ADD_LIBRARY (playerudp ${playerudpSrcs})
- TARGET_LINK_LIBRARIES (playerudp replace playercore playererror playerutils playerxdr)
+ TARGET_LINK_LIBRARIES (playerudp playercore playererror playerutils playerxdr)
TARGET_LINK_LIBRARIES (playerudp z)
PLAYER_MAKE_PKGCONFIG ("playerudp" "Player UDP messaging library - part of the Player Project" "playererror playercore" "" "" "")
Deleted: code/player/trunk/replace/CMakeLists.txt
===================================================================
--- code/player/trunk/replace/CMakeLists.txt 2008-06-16 21:20:10 UTC (rev 6591)
+++ code/player/trunk/replace/CMakeLists.txt 2008-06-16 21:51:08 UTC (rev 6592)
@@ -1,4 +0,0 @@
-SET (replaceSrcs dummy.c)
-# SET (replaceSrcs dirname.c poll.c replace.h cfmakeraw.c round.c compressBound.c)
-
-ADD_LIBRARY (replace STATIC ${replaceSrcs})
\ No newline at end of file
Deleted: code/player/trunk/replace/dummy.c
===================================================================
--- code/player/trunk/replace/dummy.c 2008-06-16 21:20:10 UTC (rev 6591)
+++ code/player/trunk/replace/dummy.c 2008-06-16 21:51:08 UTC (rev 6592)
@@ -1,7 +0,0 @@
-/* a dummy function so that libreplace.a is never empty, even when nothing
- * needs to be replaced */
-static int player_dummy(void)
-{
- return(0);
-}
-
Modified: code/player/trunk/server/CMakeLists.txt
===================================================================
--- code/player/trunk/server/CMakeLists.txt 2008-06-16 21:20:10 UTC (rev 6591)
+++ code/player/trunk/server/CMakeLists.txt 2008-06-16 21:51:08 UTC (rev 6592)
@@ -17,7 +17,7 @@
SET (playerSrcs server.cc)
# Server executable
ADD_EXECUTABLE (player ${playerSrcs})
-TARGET_LINK_LIBRARIES (player playerdrivers playercore playererror playerutils playertcp playerudp playerxdr replace ${PLAYER_EXTRA_LINK_LIBRARIES})
+TARGET_LINK_LIBRARIES (player playerdrivers playercore playererror playerutils playertcp playerudp playerxdr ${PLAYER_EXTRA_LINK_LIBRARIES})
IF (INCLUDE_RTKGUI)
TARGET_LINK_LIBRARIES (player rtk)
ENDIF (INCLUDE_RTKGUI)
Modified: code/player/trunk/server/libplayerdrivers/CMakeLists.txt
===================================================================
--- code/player/trunk/server/libplayerdrivers/CMakeLists.txt 2008-06-16 21:20:10 UTC (rev 6591)
+++ code/player/trunk/server/libplayerdrivers/CMakeLists.txt 2008-06-16 21:51:08 UTC (rev 6592)
@@ -37,6 +37,13 @@
LIST (APPEND allSourceNames ${PLAYER_BUILT_DRIVEREXTRAS})
ENDIF (PLAYER_BUILT_DRIVEREXTRAS)
MAP_TO_LIST (driversSrcs "${allSourceNames}" PLAYER_DRIVERSLIB_SOURCES_MAP)
+IF(NOT HAVE_CFMAKERAW)
+ LIST(APPEND driversSrcs ../../replace/cfmakeraw.c)
+ENDIF(NOT HAVE_CFMAKERAW)
+IF(NOT HAVE_ROUND)
+ LIST(APPEND driversSrcs ../../replace/round.c)
+ENDIF(NOT HAVE_ROUND)
+
FILTER_DUPLICATES (driversSrcs "${driversSrcs}")
# MESSAGE (STATUS "Sources is ${driversSrcs}")
@@ -86,4 +93,4 @@
# Package config file for libplayerdrivers
PLAYER_MAKE_PKGCONFIG ("playerdrivers" "Player driver library - part of the Player Project" "playercore" "" "" "-lpthread")
-PLAYER_INSTALL_HEADERS (playerdrivers driverregistry.h)
\ No newline at end of file
+PLAYER_INSTALL_HEADERS (playerdrivers driverregistry.h)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|