[simspark-svn] SF.net SVN: simspark:[65] trunk/rsgedit

[<tk...@us...>]

Revision: 65
          http://simspark.svn.sourceforge.net/simspark/?rev=65&view=rev
Author:   tknrkb
Date:     2009-05-24 04:26:48 +0000 (Sun, 24 May 2009)

Log Message:
-----------
rsgedit fix for Mac OSX

Modified Paths:
--------------
    trunk/rsgedit/CMakeLists.txt
    trunk/rsgedit/src/CMakeLists.txt
    trunk/rsgedit/wxutil/CMakeLists.txt

Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt	2009-05-23 19:19:59 UTC (rev 64)
+++ trunk/rsgedit/CMakeLists.txt	2009-05-24 04:26:48 UTC (rev 65)
@@ -4,8 +4,11 @@
 set(PACKAGE_VERSION "0.1")
 
 ########## check for headerfiles/libraries ##########
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/ ${CMAKE_SOURCE_DIR}/../spark/cmake/)
 find_package(Spark REQUIRED)
+find_package(Boost REQUIRED)
+find_package(ODE REQUIRED)
+find_package(OpenGL REQUIRED)
 find_package(wxWidgets REQUIRED gl base core adv)
 
 ########## add extra flags ########## 

Modified: trunk/rsgedit/src/CMakeLists.txt
===================================================================
--- trunk/rsgedit/src/CMakeLists.txt	2009-05-23 19:19:59 UTC (rev 64)
+++ trunk/rsgedit/src/CMakeLists.txt	2009-05-24 04:26:48 UTC (rev 65)
@@ -42,7 +42,8 @@
 include_directories(${CMAKE_SOURCE_DIR}/wxutil/include 
     ${CMAKE_SOURCE_DIR}
     ${wxWidgets_INCLUDE_DIRS} ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
-    ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
+    ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
+    ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
 
 add_executable(rsgedit ${rsgedit_SRCS})
 
@@ -51,7 +52,7 @@
 
 target_link_libraries(rsgedit pthread wxutil ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
   ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
-   ${wxWidgets_LIBRARIES})
+   ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES}) 
 
 install(TARGETS rsgedit DESTINATION ${BINDIR})
 

Modified: trunk/rsgedit/wxutil/CMakeLists.txt
===================================================================
--- trunk/rsgedit/wxutil/CMakeLists.txt	2009-05-23 19:19:59 UTC (rev 64)
+++ trunk/rsgedit/wxutil/CMakeLists.txt	2009-05-24 04:26:48 UTC (rev 65)
@@ -137,7 +137,7 @@
     ${wxWidgets_INCLUDE_DIRS})
 add_library(wxutil SHARED ${wxutil_LIB_SRCS} ${wxutil_LIB_HDRS})
 
-target_link_libraries(wxutil)
+target_link_libraries(wxutil ${wxWidgets_LIBRARIES})
 
 set_target_properties(wxutil PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
 set_target_properties(wxutil PROPERTIES VERSION 4.2.0 SOVERSION 4)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.