Revision: 8053
http://playerstage.svn.sourceforge.net/playerstage/?rev=8053&view=rev
Author: rtv
Date: 2009-07-18 23:04:05 +0000 (Sat, 18 Jul 2009)
Log Message:
-----------
fixed build on fussy OSX - disabled Ruby bindings until fixed
Modified Paths:
--------------
code/player/trunk/CMakeLists.txt
code/player/trunk/client_libs/libplayerc/bindings/CMakeLists.txt
code/player/trunk/libplayerinterface/CMakeLists.txt
Modified: code/player/trunk/CMakeLists.txt
===================================================================
--- code/player/trunk/CMakeLists.txt 2009-07-18 22:34:51 UTC (rev 8052)
+++ code/player/trunk/CMakeLists.txt 2009-07-18 23:04:05 UTC (rev 8053)
@@ -63,7 +63,7 @@
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}
${PROJECT_BINARY_DIR}/libplayercore)
# Extra directories where needed libraries, etc may be located (set by the
user)
INCLUDE_DIRECTORIES (${PLAYER_EXTRA_INCLUDE_DIRS})
-LINK_DIRECTORIES (${PLAYER_EXTRA_LIB_DIRS})
+LINK_DIRECTORIES (${PLAYER_EXTRA_LIB_DIRS} )
IF (PLAYER_OS_WIN)
# This is pretty much a universal include on Windows
@@ -88,6 +88,9 @@
IF (PLAYER_OS_WIN)
ADD_SUBDIRECTORY (replace)
ENDIF (PLAYER_OS_WIN)
+IF (PLAYER_OS_OSX)
+ ADD_SUBDIRECTORY (replace)
+ENDIF (PLAYER_OS_OSX)
MESSAGE (STATUS "")
SET (PLAYERCORE_INT_LINK_LIBRARIES "" CACHE INTERNAL "Libs to link playercore
to" FORCE)
Modified: code/player/trunk/client_libs/libplayerc/bindings/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc/bindings/CMakeLists.txt
2009-07-18 22:34:51 UTC (rev 8052)
+++ code/player/trunk/client_libs/libplayerc/bindings/CMakeLists.txt
2009-07-18 23:04:05 UTC (rev 8053)
@@ -1,2 +1,2 @@
ADD_SUBDIRECTORY (python)
-ADD_SUBDIRECTORY (ruby)
+#ADD_SUBDIRECTORY (ruby)
Modified: code/player/trunk/libplayerinterface/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayerinterface/CMakeLists.txt 2009-07-18 22:34:51 UTC
(rev 8052)
+++ code/player/trunk/libplayerinterface/CMakeLists.txt 2009-07-18 23:04:05 UTC
(rev 8053)
@@ -98,6 +98,7 @@
SET (interfaceLibFlag)
ENDIF (PLAYER_OS_QNX)
+
INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR})
PLAYER_ADD_LIBRARY (playerinterface ${playerinterfaceSrcs})
IF (PLAYER_OS_WIN)
@@ -114,6 +115,8 @@
PLAYER_MAKE_PKGCONFIG ("playerinterface" "Player Interface library - part of
the Player Project"
"" "" "" "${interfaceLibFlag}")
+TARGET_LINK_LIBRARIES (playerinterface playercommon)
+
PLAYER_INSTALL_HEADERS (playerinterface ${playerxdr_h}
addr_util.h
functiontable.h
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
