Revision: 6747
http://playerstage.svn.sourceforge.net/playerstage/?rev=6747&view=rev
Author: gbiggs
Date: 2008-07-02 19:26:35 -0700 (Wed, 02 Jul 2008)
Log Message:
-----------
Added separate options for building RTK and including it in drivers. Now
playerv builds by default again.
Modified Paths:
--------------
code/player/trunk/cmake/internal/GeneralCompileOptions.cmake
code/player/trunk/playerconfig.h.in
code/player/trunk/rtk2/CMakeLists.txt
code/player/trunk/utils/playerv/CMakeLists.txt
Modified: code/player/trunk/cmake/internal/GeneralCompileOptions.cmake
===================================================================
--- code/player/trunk/cmake/internal/GeneralCompileOptions.cmake
2008-07-03 00:27:06 UTC (rev 6746)
+++ code/player/trunk/cmake/internal/GeneralCompileOptions.cmake
2008-07-03 02:26:35 UTC (rev 6747)
@@ -3,7 +3,12 @@
SET (DEBUG_LEVEL NONE CACHE STRING "Level of debug code to be compiled: none,
low, medium or high")
IF (WITH_GTK)
- OPTION (INCLUDE_RTKGUI "Include the RTK GUI in the server." OFF)
+ OPTION (INCLUDE_RTK "Build the RTK GUI library." ON)
+ IF (INCLUDE_RTK)
+ OPTION (INCLUDE_RTKGUI "Include the RTK GUI in the server." OFF)
+ ELSE (INCLUDE_RTK)
+ SET (INCLUDE_RTKGUI OFF CACHE BOOL "Include the RTK GUI in the
server." FORCE)
+ ENDIF (INCLUDE_RTK)
ENDIF (WITH_GTK)
OPTION (BUILD_SHARED_LIBS "Build the Player libraries as shared libraries." ON)
Modified: code/player/trunk/playerconfig.h.in
===================================================================
--- code/player/trunk/playerconfig.h.in 2008-07-03 00:27:06 UTC (rev 6746)
+++ code/player/trunk/playerconfig.h.in 2008-07-03 02:26:35 UTC (rev 6747)
@@ -7,6 +7,7 @@
#cmakedefine HAVE_ROUND 1
#cmakedefine HAVE_STDINT_H 1
#cmakedefine HAVE_COMPRESSBOUND 1
+#cmakedefine INCLUDE_RTK 1
#cmakedefine INCLUDE_RTKGUI 1
#cmakedefine HAVE_CLOCK_GETTIME 1
Modified: code/player/trunk/rtk2/CMakeLists.txt
===================================================================
--- code/player/trunk/rtk2/CMakeLists.txt 2008-07-03 00:27:06 UTC (rev
6746)
+++ code/player/trunk/rtk2/CMakeLists.txt 2008-07-03 02:26:35 UTC (rev
6747)
@@ -1,4 +1,4 @@
-IF (WITH_GTK AND INCLUDE_RTKGUI)
+IF (WITH_GTK AND INCLUDE_RTK)
SET (rtkSrcs rtk.c
rtk_canvas.c
rtk_canvas_movie.c
@@ -12,4 +12,4 @@
COMPILE_FLAGS "${GNOMECANVAS_CFLAGS} ${GTK_CFLAGS}
${GDKPIXBUF_CFLAGS}")
SET_TARGET_PROPERTIES (rtk PROPERTIES
LINK_FLAGS "${GNOMECANVAS_LINKFLAGS} ${GTK_LINKFLAGS}
${GDKPIXBUF_LINKFLAGS}")
-ENDIF (WITH_GTK AND INCLUDE_RTKGUI)
\ No newline at end of file
+ENDIF (WITH_GTK AND INCLUDE_RTK)
\ No newline at end of file
Modified: code/player/trunk/utils/playerv/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/playerv/CMakeLists.txt 2008-07-03 00:27:06 UTC
(rev 6746)
+++ code/player/trunk/utils/playerv/CMakeLists.txt 2008-07-03 02:26:35 UTC
(rev 6747)
@@ -1,4 +1,4 @@
-IF (WITH_GTK AND INCLUDE_RTKGUI)
+IF (WITH_GTK AND INCLUDE_RTK)
SET (playervSrcs playerv.c
playerv.h
registry.c
@@ -32,6 +32,6 @@
COMPILE_FLAGS "${GTK_CFLAGS}")
SET_TARGET_PROPERTIES (playerv PROPERTIES
LINK_FLAGS "${GTK_LINKFLAGS}")
-ELSE (WITH_GTK AND INCLUDE_RTKGUI)
+ELSE (WITH_GTK AND INCLUDE_RTK)
MESSAGE (STATUS "playerv will not be built - GTK not found or RTK
disabled.")
-ENDIF (WITH_GTK AND INCLUDE_RTKGUI)
\ No newline at end of file
+ENDIF (WITH_GTK AND INCLUDE_RTK)
\ No newline at end of file
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
