Revision: 6562
http://playerstage.svn.sourceforge.net/playerstage/?rev=6562&view=rev
Author: jeremy_asher
Date: 2008-06-13 16:48:52 -0700 (Fri, 13 Jun 2008)
Log Message:
-----------
Linux build fixes, thanks Toby
Modified Paths:
--------------
code/stage/trunk/CMakeLists.txt
code/stage/trunk/libstage/CMakeLists.txt
code/stage/trunk/libstage/stage.hh
code/stage/trunk/libstage/worldgui.cc
Modified: code/stage/trunk/CMakeLists.txt
===================================================================
--- code/stage/trunk/CMakeLists.txt 2008-06-13 23:48:32 UTC (rev 6561)
+++ code/stage/trunk/CMakeLists.txt 2008-06-13 23:48:52 UTC (rev 6562)
@@ -7,37 +7,69 @@
SET( VERSION ${V_MAJOR}.${V_MINOR}.${V_BUGFIX} )
SET( APIVERSION ${V_MAJOR}.${V_MINOR} )
-cmake_minimum_required( VERSION 2.4 )
+SET( MIN_PLAYER_MAJOR 2 )
+SET( MIN_PLAYER_MINOR 1 )
-cmake_policy( SET CMP0003 NEW )
-cmake_policy( SET CMP0005 NEW )
+cmake_minimum_required( VERSION 2.4 FATAL_ERROR )
+IF (CMAKE_MAJOR_VERSION EQUAL 2 AND NOT CMAKE_MINOR_VERSION LESS 6)
+ cmake_policy( SET CMP0003 NEW )
+ cmake_policy( SET CMP0005 OLD )
+ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND NOT CMAKE_MINOR_VERSION LESS 6)
+
MESSAGE (STATUS "${PROJECT_NAME} version ${VERSION}")
# define some preprocessor strings that the code is expecting
-ADD_DEFINITIONS( -DPROJECT=\"${PROJECT_NAME}\"
- -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\"
- -DVERSION=\"${VERSION}\" )
+ADD_DEFINITIONS( -DPROJECT=\\\"${PROJECT_NAME}\\\"
+ -DINSTALL_PREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\"
+ -DVERSION=\\\"${VERSION}\\\" )
include(FindPkgConfig)
-#variable_watch(PLAYER_FOUND)
-#variable_watch(PLAYER_VERSION)
-pkg_search_module( GLIB glib-2.0 )
-pkg_search_module( PLAYER playercore )
-find_package(OPENGL REQUIRED)
-# include(FindFLTK) doesn't seem to work for me, so we work a bit harder
-set(FLTK_INCLUDE_DIR CMAKE_INCLUDE_PATH )
-find_package(FLTK REQUIRED)
+pkg_search_module( GLIB REQUIRED glib-2.0 )
+find_package( OpenGL REQUIRED )
+#pkg_search_module( PLAYER playercore )
+#SET(VER_PATTERN "([0-9]*)\\.([0-9]*)\\.([0-9]*)")
+#STRING( REGEX REPLACE ${VER_PATTERN} "\\1" PLAYER_MAJOR_VER ${PLAYER_VERSION}
)
+#MESSAGE( "Major: ${PLAYER_MAJOR_VER}" )
+#STRING( REGEX REPLACE ${VER_PATTERN} "\\2" PLAYER_MINOR_VER ${PLAYER_VERSION}
)
+#MESSAGE( "Minor: ${PLAYER_MINOR_VER}" )
+#IF( NOT PLAYER_MAJOR_VER LESS MIN_PLAYER_MAJOR )
+# IF( NOT PLAYER_MINOR_VER LESS MIN_PLAYER_MINOR )
+# MESSAGE( STATUS " Player up to date, building plugin")
+# ADD_SUBDIRECTORY(libstageplugin)
+# ENDIF( NOT PLAYER_MINOR_VER LESS MIN_PLAYER_MINOR )
+#ENDIF( NOT PLAYER_MAJOR_VER LESS MIN_PLAYER_MAJOR )
+
+FIND_PROGRAM (FLTKCONFIG NAMES fltk-config)
+IF (FLTKCONFIG)
+ EXECUTE_PROCESS (COMMAND fltk-config --cxxflags --use-gl --use-images
+ OUTPUT_VARIABLE FLTK_CFLAGS
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ EXECUTE_PROCESS (COMMAND fltk-config --ldflags --use-gl --use-images
+ OUTPUT_VARIABLE FLTK_LIBRARIES
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ MESSAGE (STATUS "Found FLTK")
+ SET (FLTK_FOUND TRUE)
+ELSE (FLTKCONFIG)
+ MESSAGE (FATAL_ERROR "FLTK not found, aborting")
+ SET (FLTK_FOUND FALSE)
+ENDIF (FLTKCONFIG)
+
+
+IF (APPLE)
+ MESSAGE(STATUS "Setting Apple specific flags")
+ SET(APPLE_LIBRARIES
"-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
+ENDIF (APPLE)
+
# all targets need these include directories
include_directories( .
libstage
replace
${GLIB_INCLUDE_DIRS}
${FLTK_INCLUDE_DIR}
- ${OPENGL_INCLUDE_DIR}
- ${CMAKE_INCLUDE_PATH}
+ ${CMAKE_INCLUDE_PATH}
)
@@ -54,16 +86,6 @@
ADD_SUBDIRECTORY(libstage)
ADD_SUBDIRECTORY(examples)
-string( REGEX MATCH "([0-9]*)\\.([0-9]*)\\." player_ver ${PLAYER_VERSION} )
-SET(min_player_major 2)
-SET(min_player_minor 1)
-IF( NOT CMAKE_MATCH_1 LESS min_player_major )
- IF( NOT CMAKE_MATCH_2 LESS min_player_minor )
- MESSAGE( "Found Player v${PLAYER_VERSION} in
${PLAYER_INCLUDE_DIRS}")
- ADD_SUBDIRECTORY(libstageplugin)
- ENDIF()
-ENDIF()
-
INSTALL(FILES rgb.txt stagelogo.png
DESTINATION share/stage
)
Modified: code/stage/trunk/libstage/CMakeLists.txt
===================================================================
--- code/stage/trunk/libstage/CMakeLists.txt 2008-06-13 23:48:32 UTC (rev
6561)
+++ code/stage/trunk/libstage/CMakeLists.txt 2008-06-13 23:48:52 UTC (rev
6562)
@@ -33,6 +33,7 @@
${GLIB_LIBRARIES}
${OPENGL_LIBRARIES}
${FLTK_LIBRARIES}
+ ${APPLE_LIBRARIES}
ltdl
)
Modified: code/stage/trunk/libstage/stage.hh
===================================================================
--- code/stage/trunk/libstage/stage.hh 2008-06-13 23:48:32 UTC (rev 6561)
+++ code/stage/trunk/libstage/stage.hh 2008-06-13 23:48:52 UTC (rev 6562)
@@ -94,6 +94,7 @@
GHashTable* Typetable();
// foreward declare
+ class StgCanvas;
class Worldfile;
/// Copyright string
Modified: code/stage/trunk/libstage/worldgui.cc
===================================================================
--- code/stage/trunk/libstage/worldgui.cc 2008-06-13 23:48:32 UTC (rev
6561)
+++ code/stage/trunk/libstage/worldgui.cc 2008-06-13 23:48:52 UTC (rev
6562)
@@ -178,7 +178,7 @@
FL_MENU_TOGGLE| (canvas->showflags & STG_SHOW_TRAILRISE
? FL_MENU_VALUE : 0 ));
mbar->add( "&Help", 0, 0, 0, FL_SUBMENU );
- mbar->add( "Help/&About Stage...", NULL, (Fl_Callback *)About_cb, this
);
+ mbar->add( "Help/&About Stage...", 0, (Fl_Callback *)About_cb, this );
//mbar->add( "Help/HTML Documentation", FL_CTRL + 'g', (Fl_Callback
*)dummy_cb );
callback( (Fl_Callback*)WindowCallback, this );
@@ -366,8 +366,7 @@
switch (choice) {
case 1: // Yes
- bool saved = SaveAsDialog();
- if ( saved ) {
+ if ( SaveAsDialog() ) {
return true;
}
else {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
