Menu
▾
▴
simspark-svn — SimSpark SVN commits
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(4) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(20) |
Feb
(11) |
Mar
(6) |
Apr
(5) |
May
(4) |
Jun
(7) |
Jul
(9) |
Aug
(11) |
Sep
|
Oct
(4) |
Nov
(13) |
Dec
(21) |
| 2010 |
Jan
(23) |
Feb
(32) |
Mar
(6) |
Apr
(2) |
May
(10) |
Jun
(15) |
Jul
(1) |
Aug
(1) |
Sep
(3) |
Oct
|
Nov
(1) |
Dec
(16) |
| 2011 |
Jan
(1) |
Feb
(5) |
Mar
(19) |
Apr
(13) |
May
(4) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(4) |
Feb
(8) |
Mar
(2) |
Apr
(6) |
May
(13) |
Jun
(1) |
Jul
|
Aug
|
Sep
(5) |
Oct
|
Nov
(4) |
Dec
|
| 2013 |
Jan
(1) |
Feb
(2) |
Mar
(15) |
Apr
(2) |
May
(4) |
Jun
(17) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
(6) |
Jun
(6) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
(2) |
Mar
(1) |
Apr
(1) |
May
(6) |
Jun
(1) |
Jul
(2) |
Aug
|
Sep
(7) |
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tk...@us...> - 2009-05-27 15:31:19
|
Revision: 66
http://simspark.svn.sourceforge.net/simspark/?rev=66&view=rev
Author: tknrkb
Date: 2009-05-27 15:31:10 +0000 (Wed, 27 May 2009)
Log Message:
-----------
fix for compile on OSX Tiger.
Modified Paths:
--------------
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt
trunk/rcssserver3d/simspark/CMakeLists.txt
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-05-24 04:26:48 UTC (rev 65)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-05-27 15:31:10 UTC (rev 66)
@@ -117,7 +117,7 @@
target_link_libraries(soccer ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
- ${OPENGL_gl_LIBRARY})
+ ${OPENGL_gl_LIBRARY} ${RCSSNET3D_LIBRARY})
if (NOT APPLE)
set_target_properties(soccer PROPERTIES VERSION 1.0.0 SOVERSION 1)
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-05-24 04:26:48 UTC (rev 65)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-05-27 15:31:10 UTC (rev 66)
@@ -26,7 +26,8 @@
${soccermonitor_LIB_HDRS})
target_link_libraries(soccermonitor ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES})
+ ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${RCSSNET3D_LIBRARY})
if (NOT APPLE)
set_target_properties(soccermonitor PROPERTIES VERSION 1.0.0 SOVERSION 1)
Modified: trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt 2009-05-24 04:26:48 UTC (rev 65)
+++ trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt 2009-05-27 15:31:10 UTC (rev 66)
@@ -16,7 +16,7 @@
target_link_libraries(rcssmonitor3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
- ${SDL_LINK_LIBS})
+ ${SDL_LINK_LIBS} ${RCSSNET3D_LIBRARY})
set_target_properties(rcssmonitor3d PROPERTIES
INSTALL_RPATH "${RPATH_DIRECTORIES}")
Modified: trunk/rcssserver3d/simspark/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/simspark/CMakeLists.txt 2009-05-24 04:26:48 UTC (rev 65)
+++ trunk/rcssserver3d/simspark/CMakeLists.txt 2009-05-27 15:31:10 UTC (rev 66)
@@ -16,7 +16,7 @@
target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
- ${SDL_LINK_LIBS})
+ ${SDL_LINK_LIBS} ${RCSSNET3D_LIBRARY})
set_target_properties(simspark PROPERTIES INSTALL_RPATH "${RPATH_DIRECTORIES}")
install(TARGETS simspark DESTINATION ${BINDIR})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tk...@us...> - 2009-05-24 04:27:01
|
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.
|
|
From: <tk...@us...> - 2009-05-23 19:20:07
|
Revision: 64
http://simspark.svn.sourceforge.net/simspark/?rev=64&view=rev
Author: tknrkb
Date: 2009-05-23 19:19:59 +0000 (Sat, 23 May 2009)
Log Message:
-----------
rcssmonitor3d fix for Mac OSX
Modified Paths:
--------------
trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt
trunk/rcssserver3d/rcssmonitor3d/main.cpp
Modified: trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
+++ trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt 2009-05-23 19:19:59 UTC (rev 64)
@@ -4,13 +4,19 @@
main.cpp
)
+if (APPLE)
+ set(SDL_LINK_LIBS ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
+endif (APPLE)
+
include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
+ ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
+ ${SDL_INCLUDE_DIR})
add_executable(rcssmonitor3d ${rcssmonitor3d_SRCS})
target_link_libraries(rcssmonitor3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${SDL_LINK_LIBS})
set_target_properties(rcssmonitor3d PROPERTIES
INSTALL_RPATH "${RPATH_DIRECTORIES}")
Modified: trunk/rcssserver3d/rcssmonitor3d/main.cpp
===================================================================
--- trunk/rcssserver3d/rcssmonitor3d/main.cpp 2009-05-23 19:02:47 UTC (rev 63)
+++ trunk/rcssserver3d/rcssmonitor3d/main.cpp 2009-05-23 19:19:59 UTC (rev 64)
@@ -30,6 +30,10 @@
#include <rcssserver3d_config.h>
#endif
+#if __APPLE__
+#include <SDL.h>
+#endif
+
using namespace spark;
using namespace kerosin;
using namespace oxygen;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tk...@us...> - 2009-05-23 19:03:00
|
Revision: 63
http://simspark.svn.sourceforge.net/simspark/?rev=63&view=rev
Author: tknrkb
Date: 2009-05-23 19:02:47 +0000 (Sat, 23 May 2009)
Log Message:
-----------
plugin link.txt fix for Mac OSX
Modified Paths:
--------------
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/spark/plugin/collisionperceptor/CMakeLists.txt
trunk/spark/plugin/filesystemrar/CMakeLists.txt
trunk/spark/plugin/filesystemstd/CMakeLists.txt
trunk/spark/plugin/filesystemzip/CMakeLists.txt
trunk/spark/plugin/forceeffector/CMakeLists.txt
trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt
trunk/spark/plugin/imageperceptor/CMakeLists.txt
trunk/spark/plugin/inputsdl/CMakeLists.txt
trunk/spark/plugin/inputwx/CMakeLists.txt
trunk/spark/plugin/objimporter/CMakeLists.txt
trunk/spark/plugin/openglsyssdl/CMakeLists.txt
trunk/spark/plugin/openglsyswx/CMakeLists.txt
trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt
trunk/spark/plugin/rosimporter/CMakeLists.txt
trunk/spark/plugin/rubysceneimporter/CMakeLists.txt
trunk/spark/plugin/sceneeffector/CMakeLists.txt
trunk/spark/plugin/sexpparser/CMakeLists.txt
trunk/spark/plugin/soundsystembass/CMakeLists.txt
trunk/spark/plugin/soundsystemfmod/CMakeLists.txt
trunk/spark/plugin/sparkagent/CMakeLists.txt
trunk/spark/plugin/sparkmonitor/CMakeLists.txt
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -119,7 +119,10 @@
${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
${OPENGL_gl_LIBRARY})
-set_target_properties(soccer PROPERTIES VERSION 1.0.0 SOVERSION 1)
+if (NOT APPLE)
+ set_target_properties(soccer PROPERTIES VERSION 1.0.0 SOVERSION 1)
+endif (NOT APPLE)
+
install(TARGETS soccer DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -28,7 +28,10 @@
target_link_libraries(soccermonitor ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES})
-set_target_properties(soccermonitor PROPERTIES VERSION 1.0.0 SOVERSION 1)
+if (NOT APPLE)
+ set_target_properties(soccermonitor PROPERTIES VERSION 1.0.0 SOVERSION 1)
+endif (NOT APPLE)
+
install(TARGETS soccermonitor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/collisionperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/collisionperceptor/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/collisionperceptor/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -24,5 +24,8 @@
target_link_libraries(collisionperceptor ${spark_libs})
-set_target_properties(collisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(collisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS collisionperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemrar/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemrar/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/filesystemrar/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -12,5 +12,8 @@
target_link_libraries(filesystemrar ${spark_libs})
-set_target_properties(filesystemrar PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(filesystemrar PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS filesystemrar DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemstd/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemstd/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/filesystemstd/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -12,5 +12,8 @@
target_link_libraries(filesystemstd ${spark_libs})
-set_target_properties(filesystemstd PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(filesystemstd PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS filesystemstd DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemzip/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -16,6 +16,9 @@
target_link_libraries(filesystemzip ${Boost_REGEX_LIBRARY}
${spark_libs} ${ZLIB_LIBRARIES})
- set_target_properties(filesystemzip PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ if (NOT APPLE)
+ set_target_properties(filesystemzip PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ endif (NOT APPLE)
+
install(TARGETS filesystemzip DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
endif (Boost_REGEX_FOUND AND ZLIB_FOUND)
Modified: trunk/spark/plugin/forceeffector/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/forceeffector/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/forceeffector/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -13,5 +13,8 @@
target_link_libraries(forceeffector ${spark_libs})
-set_target_properties(forceeffector PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(forceeffector PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS forceeffector DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -12,5 +12,8 @@
target_link_libraries(gyrorateperceptor ${spark_libs})
-set_target_properties(gyrorateperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(gyrorateperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS gyrorateperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/imageperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -12,7 +12,10 @@
target_link_libraries(imageperceptor ${spark_libs} ${Boost_LIBRARIES})
-set_target_properties(imageperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
if (NOT APPLE)
+ set_target_properties(imageperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
+if (NOT APPLE)
install(TARGETS imageperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
endif (NOT APPLE)
Modified: trunk/spark/plugin/inputsdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputsdl/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/inputsdl/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -25,6 +25,9 @@
target_link_libraries(inputsdl ${spark_libs})
-set_target_properties(inputsdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(inputsdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS inputsdl DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/inputwx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputwx/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/inputwx/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -18,6 +18,9 @@
target_link_libraries(inputwx ${wxWidgets_LIBRARIES} ${spark_libs})
set_target_properties(inputwx PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
- set_target_properties(inputwx PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ if (NOT APPLE)
+ set_target_properties(inputwx PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ endif (NOT APPLE)
+
install(TARGETS inputwx DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
endif (wxWidgets_FOUND)
Modified: trunk/spark/plugin/objimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/objimporter/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/objimporter/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -12,5 +12,8 @@
target_link_libraries(objimporter ${spark_libs})
-set_target_properties(objimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(objimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS objimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/openglsyssdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -14,5 +14,8 @@
target_link_libraries(openglsyssdl ${spark_libs})
-set_target_properties(openglsyssdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(openglsyssdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS openglsyssdl DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/openglsyswx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyswx/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/openglsyswx/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -15,7 +15,10 @@
target_link_libraries(openglsyswx ${wxWidgets_LIBRARIES} ${spark_libs})
- set_target_properties(openglsyswx PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ if (NOT APPLE)
+ set_target_properties(openglsyswx PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ endif (NOT APPLE)
+
set_target_properties(inputwx PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
install(TARGETS openglsyswx DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -12,6 +12,9 @@
target_link_libraries(perfectvisionperceptor ${spark_libs})
-set_target_properties(perfectvisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(perfectvisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS perfectvisionperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/rosimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -13,5 +13,8 @@
target_link_libraries(rosimporter tinyxml_ex ${spark_libs})
-set_target_properties(rosimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(rosimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS rosimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/rubysceneimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/rubysceneimporter/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/rubysceneimporter/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -11,5 +11,8 @@
target_link_libraries(rubysceneimporter sexp ${spark_libs})
-set_target_properties(rubysceneimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(rubysceneimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS rubysceneimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sceneeffector/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sceneeffector/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/sceneeffector/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -13,5 +13,8 @@
target_link_libraries(sceneeffector ${spark_libs})
-set_target_properties(sceneeffector PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(sceneeffector PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS sceneeffector DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sexpparser/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sexpparser/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/sexpparser/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -11,5 +11,8 @@
target_link_libraries(sexpparser sexp ${spark_libs})
-set_target_properties(sexpparser PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(sexpparser PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS sexpparser DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/soundsystembass/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/soundsystembass/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/soundsystembass/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -18,5 +18,8 @@
target_link_libraries(soundsystembass ${spark_libs})
-set_target_properties(soundsystembass PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(soundsystembass PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS soundsystembass DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/soundsystemfmod/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/soundsystemfmod/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/soundsystemfmod/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -22,6 +22,9 @@
target_link_libraries(soundsystemfmod ${FMOD_LIBRARIES} ${spark_libs})
- set_target_properties(soundsystemfmod PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ if (NOT APPLE)
+ set_target_properties(soundsystemfmod PROPERTIES VERSION 0.0.0 SOVERSION 0)
+ endif (NOT APPLE)
+
install(TARGETS soundsystemfmod DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
endif (FMOD_FOUND)
Modified: trunk/spark/plugin/sparkagent/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sparkagent/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/sparkagent/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -33,5 +33,8 @@
target_link_libraries(sparkagent ${spark_libs})
-set_target_properties(sparkagent PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(sparkagent PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS sparkagent DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sparkmonitor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sparkmonitor/CMakeLists.txt 2009-04-30 16:03:43 UTC (rev 62)
+++ trunk/spark/plugin/sparkmonitor/CMakeLists.txt 2009-05-23 19:02:47 UTC (rev 63)
@@ -17,5 +17,8 @@
target_link_libraries(sparkmonitor sexp ${spark_libs})
-set_target_properties(sparkmonitor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+if (NOT APPLE)
+ set_target_properties(sparkmonitor PROPERTIES VERSION 0.0.0 SOVERSION 0)
+endif (NOT APPLE)
+
install(TARGETS sparkmonitor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sgv...@us...> - 2009-04-30 16:03:50
|
Revision: 62
http://simspark.svn.sourceforge.net/simspark/?rev=62&view=rev
Author: sgvandijk
Date: 2009-04-30 16:03:43 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
- add camera controls to external monitor
Modified Paths:
--------------
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.cpp
trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.h
trunk/rcssserver3d/rcssmonitor3d/soccerbindings.rb
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-04-30 13:26:16 UTC (rev 61)
+++ trunk/rcssserver3d/ChangeLog 2009-04-30 16:03:43 UTC (rev 62)
@@ -1,3 +1,13 @@
+2009-04-30 Sander van Dijk <sgv...@gm...>
+
+ * rcssmonitor3d/rcssmonitor3d.rb
+ - set camera parameters to those used in internal monitor
+
+ * plugin/soccermonitor/soccerinputlogplayer.h
+ * plugin/soccermonitor/soccerinputlogplayer.cpp
+ * rcssmonitor3d/soccerbindings.rb
+ - add camera controls to external monitor
+
2009-04-08 Hedayat Vatankhah <he...@gr...>
* plugin/soccer/beameffector/beamaction.h (BeamAction):
@@ -99,4 +109,4 @@
* plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp:
* plugin/soccer/agentstateperceptor/agentstateperceptor.cpp:
- Replaced make_shared() with .lock() function call.(fixed compilation
- error with recent boost versions.)
\ No newline at end of file
+ error with recent boost versions.)
Modified: trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.cpp 2009-04-30 13:26:16 UTC (rev 61)
+++ trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.cpp 2009-04-30 16:03:43 UTC (rev 62)
@@ -20,6 +20,7 @@
#include "soccerinputlogplayer.h"
#include <zeitgeist/scriptserver/scriptserver.h>
#include <zeitgeist/logserver/logserver.h>
+#include <oxygen/physicsserver/body.h>
using namespace boost;
using namespace zeitgeist;
@@ -42,6 +43,14 @@
mScriptServer->CreateVariable("Command.StepBackward", CmdStepBackward);
mScriptServer->CreateVariable("Command.BPlayback", CmdBPlayback);
+ mScriptServer->CreateVariable("Command.CameraLeftGoal", CmdCameraLeftGoal);
+ mScriptServer->CreateVariable("Command.CameraLeftCorner", CmdCameraLeftCorner);
+ mScriptServer->CreateVariable("Command.CameraMiddleLeft", CmdCameraMiddleLeft);
+ mScriptServer->CreateVariable("Command.CameraMiddleRight", CmdCameraMiddleRight);
+ mScriptServer->CreateVariable("Command.CameraMiddle", CmdCameraMiddle);
+ mScriptServer->CreateVariable("Command.CameraRightCorner", CmdCameraRightCorner);
+ mScriptServer->CreateVariable("Command.CameraRightGoal", CmdCameraRightGoal);
+
mMonitorClient = shared_dynamic_cast<SimControlNode>
(GetCore()->Get("/sys/server/simulation/SparkMonitorLogFileServer"));
@@ -51,6 +60,26 @@
<< "ERROR: (SoccerInput) Unable to get SparkMonitorClient\n";
}
+ // get fps controller
+ mFPS = shared_dynamic_cast<FPSController>
+ (GetCore()->Get("/usr/scene/camera/physics/controller"));
+
+ if (mFPS.get() == 0)
+ {
+ GetLog()->Error()
+ << "ERROR: (InternalSoccerInput) Unable to get FPS controller\n";
+ }
+
+ // get camera body
+ mCameraBody = shared_dynamic_cast<Body>
+ (GetCore()->Get("/usr/scene/camera/physics"));
+
+ if (mCameraBody.get() == 0)
+ {
+ GetLog()->Error()
+ << "ERROR: (SoccerInput) Unable to get camera body\n";
+ }
+
}
void SoccerInputLogPlayer::OnUnlink()
@@ -108,5 +137,68 @@
mScriptServer->Eval("monitorLogServer.playBackward()");
}
break;
+ case CmdCameraLeftGoal:
+ if (input.GetKeyPress())
+ {
+ salt::Vector3f pos(-12*0.8, 0.0, 12*0.4);
+ mCameraBody->SetPosition(pos);
+ mFPS->SetHAngleDeg(90);
+ mFPS->SetVAngleDeg(35);
+ }
+ break;
+ case CmdCameraLeftCorner:
+ if (input.GetKeyPress())
+ {
+ salt::Vector3f pos(-12*0.8, -8, 12*0.4);
+ mCameraBody->SetPosition(pos);
+ mFPS->SetHAngleDeg(50);
+ mFPS->SetVAngleDeg(30);
+ }
+ break;
+ case CmdCameraMiddleLeft:
+ if (input.GetKeyPress())
+ {
+ salt::Vector3f pos(0, -8, 12*0.4);
+ mCameraBody->SetPosition(pos);
+ mFPS->SetHAngleDeg(salt::gRadToDeg(-0.625));
+ mFPS->SetVAngleDeg(40);
+ }
+ break;
+ case CmdCameraMiddleRight:
+ if (input.GetKeyPress())
+ {
+ salt::Vector3f pos(0, -8, 12*0.4);
+ mCameraBody->SetPosition(pos);
+ mFPS->SetHAngleDeg(salt::gRadToDeg(0.625));
+ mFPS->SetVAngleDeg(40);
+ }
+ break;
+ case CmdCameraMiddle:
+ if (input.GetKeyPress())
+ {
+ salt::Vector3f pos(0, -8*1.1, 12*0.6);
+ mCameraBody->SetPosition(pos);
+ mFPS->SetHAngleDeg(0);
+ mFPS->SetVAngleDeg(45);
+ }
+ break;
+ case CmdCameraRightCorner:
+ if (input.GetKeyPress())
+ {
+ salt::Vector3f pos(12*0.8, -8, 12*0.4);
+ mCameraBody->SetPosition(pos);
+ mFPS->SetHAngleDeg(-50);
+ mFPS->SetVAngleDeg(30);
+ }
+ break;
+ case CmdCameraRightGoal:
+ if (input.GetKeyPress())
+ {
+ salt::Vector3f pos(12*0.8, 0.0, 12*0.4);
+ mCameraBody->SetPosition(pos);
+ mFPS->SetHAngleDeg(-90);
+ mFPS->SetVAngleDeg(35);
+ }
+ break;
};
}
Modified: trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.h
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.h 2009-04-30 13:26:16 UTC (rev 61)
+++ trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.h 2009-04-30 16:03:43 UTC (rev 62)
@@ -24,6 +24,7 @@
#include <kerosin/inputserver/inputcontrol.h>
#include <oxygen/simulationserver/simcontrolnode.h>
+
class SoccerInputLogPlayer : public kerosin::InputItem
{
public:
@@ -33,7 +34,14 @@
CmdPause = CmdUser + 1,
CmdStepForward = CmdUser + 2,
CmdStepBackward = CmdUser + 3,
- CmdBPlayback = CmdUser + 4
+ CmdBPlayback = CmdUser + 4,
+ CmdCameraLeftGoal = CmdBPlayback + 1,
+ CmdCameraLeftCorner = CmdCameraLeftGoal + 1,
+ CmdCameraMiddleLeft = CmdCameraLeftCorner + 1,
+ CmdCameraMiddle = CmdCameraMiddleLeft + 1,
+ CmdCameraMiddleRight = CmdCameraMiddle + 1,
+ CmdCameraRightCorner = CmdCameraMiddleRight + 1,
+ CmdCameraRightGoal = CmdCameraRightCorner + 1
};
public:
@@ -62,6 +70,12 @@
/** cached reference to the script server */
boost::shared_ptr<zeitgeist::ScriptServer> mScriptServer;
+
+ /** cached reference to the camera body */
+ boost::shared_ptr<oxygen::Body> mCameraBody;
+
+ /** cached reference to the camera body */
+ boost::shared_ptr<oxygen::FPSController> mFPS;
};
DECLARE_CLASS(SoccerInputLogPlayer);
Modified: trunk/rcssserver3d/rcssmonitor3d/soccerbindings.rb
===================================================================
--- trunk/rcssserver3d/rcssmonitor3d/soccerbindings.rb 2009-04-30 13:26:16 UTC (rev 61)
+++ trunk/rcssserver3d/rcssmonitor3d/soccerbindings.rb 2009-04-30 16:03:43 UTC (rev 62)
@@ -15,6 +15,13 @@
inputServer.bindCommand('f', Command.StepForward);
inputServer.bindCommand('b', Command.StepBackward);
inputServer.bindCommand('l', Command.BPlayback);
+ inputServer.bindCommand('1', Command.CameraLeftGoal);
+ inputServer.bindCommand('2', Command.CameraLeftCorner);
+ inputServer.bindCommand('3', Command.CameraMiddleLeft);
+ inputServer.bindCommand('4', Command.CameraMiddle);
+ inputServer.bindCommand('5', Command.CameraMiddleRight);
+ inputServer.bindCommand('6', Command.CameraRightCorner);
+ inputServer.bindCommand('7', Command.CameraRightGoal);
else
print "setting bindings for online monitor\n\n";
inputServer.bindCommand('k', Command.KickOff);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sgv...@us...> - 2009-04-30 13:26:20
|
Revision: 61
http://simspark.svn.sourceforge.net/simspark/?rev=61&view=rev
Author: sgvandijk
Date: 2009-04-30 13:26:16 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
- set camera parameters to those used in internal monitor
Modified Paths:
--------------
trunk/rcssserver3d/rcssmonitor3d/rcssmonitor3d.rb
Modified: trunk/rcssserver3d/rcssmonitor3d/rcssmonitor3d.rb
===================================================================
--- trunk/rcssserver3d/rcssmonitor3d/rcssmonitor3d.rb 2009-04-14 19:59:50 UTC (rev 60)
+++ trunk/rcssserver3d/rcssmonitor3d/rcssmonitor3d.rb 2009-04-30 13:26:16 UTC (rev 61)
@@ -13,18 +13,18 @@
# let spark create a default camera
sparkAddFPSCamera(
- $scenePath+'camera',
- x = -5,
- y = -40,
- z = 2,
+ $scenePath+'camera',
+ x = 0,
+ y = -4,
+ z = 0.6,
vAngle = 10.0,
hAngle = 10.0,
- maxSpeed = 15.0,
- accel = 400.0,
- drag = 4,
- addCollider = false,
+ maxSpeed = 1.5,
+ accel = 40.0,
+ drag = 4,
+ addCollider = false,
colliderRadius = 2.0
- )
+ )
# setup default input bindings
run "scripts/bindings.rb"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-04-14 20:00:06
|
Revision: 60
http://simspark.svn.sourceforge.net/simspark/?rev=60&view=rev
Author: hedayat
Date: 2009-04-14 19:59:50 +0000 (Tue, 14 Apr 2009)
Log Message:
-----------
- print Skipping remaining time errors as warnings only in Debug mode
- prevent a segfault on linux when simspark quit.
Modified Paths:
--------------
trunk/spark/ChangeLog
trunk/spark/lib/oxygen/simulationserver/simulationserver.cpp
trunk/spark/plugin/CMakeLists.txt
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-04-08 11:39:36 UTC (rev 59)
+++ trunk/spark/ChangeLog 2009-04-14 19:59:50 UTC (rev 60)
@@ -1,3 +1,11 @@
+2009-04-15 Hedayat Vatankhah <he...@gr...>
+
+ * plugin/CMakeLists.txt:
+ - don't link plugins to spark libraries to prevent segfault on Linux
+
+ * lib/oxygen/simulationserver/simulationserver.cpp (UpdateDeltaTimeAfterStep):
+ - Skipping remaining time error is now a debug warning message
+
2009-03-17 Hedayat Vatankhah <he...@gr...>
* lib/kerosin/imageserver/imageserver.h (ImageServer):
Modified: trunk/spark/lib/oxygen/simulationserver/simulationserver.cpp
===================================================================
--- trunk/spark/lib/oxygen/simulationserver/simulationserver.cpp 2009-04-08 11:39:36 UTC (rev 59)
+++ trunk/spark/lib/oxygen/simulationserver/simulationserver.cpp 2009-04-14 19:59:50 UTC (rev 60)
@@ -520,8 +520,8 @@
if (mAdjustSpeed && mSumDeltaTime > mMaxStepsPerCycle
* mSimStep)
{
- GetLog()->Error()
- << "(SimulationServer) ERROR: Skipping remaining time: "
+ GetLog()->Debug()
+ << "(SimulationServer) Warning: Skipping remaining time: "
<< mSumDeltaTime - mSimStep << '\n';
mSumDeltaTime = 0;
}
Modified: trunk/spark/plugin/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/CMakeLists.txt 2009-04-08 11:39:36 UTC (rev 59)
+++ trunk/spark/plugin/CMakeLists.txt 2009-04-14 19:59:50 UTC (rev 60)
@@ -1,7 +1,10 @@
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
-set(spark_libs kerosin oxygen zeitgeist salt)
+# It is problematic under Linux! Will cause segfaults on simspark exit.
+if (WIN32 OR APPLE)
+ set(spark_libs kerosin oxygen salt zeitgeist)
+endif (WIN32 OR APPLE)
if (APPLE AND USE_COREFOUNDATION)
set(spark_libs ${spark_libs} /System/Library/Frameworks/CoreFoundation.framework)
endif (APPLE AND USE_COREFOUNDATION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-04-08 11:39:46
|
Revision: 59
http://simspark.svn.sourceforge.net/simspark/?rev=59&view=rev
Author: hedayat
Date: 2009-04-08 11:39:36 +0000 (Wed, 08 Apr 2009)
Log Message:
-----------
Fixed some warnings
Modified Paths:
--------------
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/plugin/soccer/beameffector/beamaction.h
trunk/rcssserver3d/plugin/soccer/kickeffector/kickaction.h
trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h
trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp
trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp
trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.h
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-04-07 08:21:33 UTC (rev 58)
+++ trunk/rcssserver3d/ChangeLog 2009-04-08 11:39:36 UTC (rev 59)
@@ -1,3 +1,19 @@
+2009-04-08 Hedayat Vatankhah <he...@gr...>
+
+ * plugin/soccer/beameffector/beamaction.h (BeamAction):
+ - fixed const function declaration
+
+ * plugin/soccer/soccerbase/soccerbase.cpp (SoccerBase::MoveAgent):
+ - removed useless statements
+
+ * plugin/soccer/kickeffector/kickaction.h:
+ * plugin/soccer/soccerruleaspect/soccerruleaspect.cpp:
+ - fixed variables order in ctor
+
+ * plugin/soccer/visionperceptor/visionperceptor.h:
+ * plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h:
+ - added missing return statement
+
2009-03-05 Hedayat Vatankhah <he...@gr...>
* linux/rcssserver3d.desktop:
Modified: trunk/rcssserver3d/plugin/soccer/beameffector/beamaction.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/beameffector/beamaction.h 2009-04-07 08:21:33 UTC (rev 58)
+++ trunk/rcssserver3d/plugin/soccer/beameffector/beamaction.h 2009-04-08 11:39:36 UTC (rev 59)
@@ -33,13 +33,13 @@
virtual ~BeamAction() {}
/** returns x coord of the position the agent wants to beam to */
- const float GetPosX() { return mPosX; }
+ float GetPosX() const { return mPosX; }
/** returns x coord of the position the agent wants to beam to */
- const float GetPosY() { return mPosY; }
+ float GetPosY() const { return mPosY; }
/** returns the stored angle in the x-y-plane */
- const float GetXYAngle() { return mXYAngle; }
+ float GetXYAngle() const { return mXYAngle; }
protected:
/** the x coord of the position to beam the agent to */
Modified: trunk/rcssserver3d/plugin/soccer/kickeffector/kickaction.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/kickeffector/kickaction.h 2009-04-07 08:21:33 UTC (rev 58)
+++ trunk/rcssserver3d/plugin/soccer/kickeffector/kickaction.h 2009-04-08 11:39:36 UTC (rev 59)
@@ -29,7 +29,7 @@
{
public:
KickAction(const std::string& predicate, float phi, float power)
- : ActionObject(predicate), mKickAngle(phi),mPower(power) {}
+ : ActionObject(predicate), mPower(power), mKickAngle(phi) {}
virtual ~KickAction() {}
Modified: trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h 2009-04-07 08:21:33 UTC (rev 58)
+++ trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h 2009-04-08 11:39:36 UTC (rev 59)
@@ -53,6 +53,8 @@
mTheta = rhs.mTheta;
mPhi = rhs.mPhi;
mDist = rhs.mDist;
+
+ return *this;
}
int operator==(const ObjectData& rhs) const
Modified: trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp 2009-04-07 08:21:33 UTC (rev 58)
+++ trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp 2009-04-08 11:39:36 UTC (rev 59)
@@ -661,7 +661,7 @@
Leaf::TLeafList::iterator iter = leafList.begin();
// move all child bodies
- for (iter; iter != leafList.end(); ++iter)
+ for (; iter != leafList.end(); ++iter)
{
shared_ptr<Body> childBody =
shared_dynamic_cast<Body>(*iter);
@@ -715,7 +715,7 @@
Leaf::TLeafList::iterator iter = leafList.begin();
// move all child bodies
- for (iter;
+ for (;
iter != leafList.end();
++iter
)
Modified: trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp 2009-04-07 08:21:33 UTC (rev 58)
+++ trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp 2009-04-08 11:39:36 UTC (rev 59)
@@ -50,10 +50,10 @@
mSingleHalfTime(false),
mSayMsgSize(20),
mAudioCutDist(50.0),
- mUseOffside(true),
mFirstCollidingAgent(true),
mNotOffside(false),
- mLastModeWasPlayOn(false)
+ mLastModeWasPlayOn(false),
+ mUseOffside(true)
{
mFreeKickPos = Vector3f(0.0,0.0,mBallRadius);
Modified: trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.h 2009-04-07 08:21:33 UTC (rev 58)
+++ trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.h 2009-04-08 11:39:36 UTC (rev 59)
@@ -51,6 +51,8 @@
mTheta = rhs.mTheta;
mPhi = rhs.mPhi;
mDist = rhs.mDist;
+
+ return *this;
}
int operator==(const ObjectData& rhs) const
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-04-07 08:21:41
|
Revision: 58
http://simspark.svn.sourceforge.net/simspark/?rev=58&view=rev
Author: hedayat
Date: 2009-04-07 08:21:33 +0000 (Tue, 07 Apr 2009)
Log Message:
-----------
Added additional ODE compiler flags
Change naosoccersim.rb settings for two 5min halves
Added setScore and setTime sentences in naosoccersim.rb, to make it easier to run a game from the middle of the game!
Respect CXXFLAGS environment variable in the default build type
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/simspark/naosoccersim.rb
trunk/spark/cmake/FindODE.cmake
trunk/spark/lib/oxygen/CMakeLists.txt
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-03-18 07:26:56 UTC (rev 57)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-04-07 08:21:33 UTC (rev 58)
@@ -30,7 +30,7 @@
include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
if (UNIX)
- set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
+ set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE
STRING "Common C++ compiler flags" FORCE)
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual" CACHE
STRING "C++ compiler flags for Debug builds" FORCE)
Modified: trunk/rcssserver3d/simspark/naosoccersim.rb
===================================================================
--- trunk/rcssserver3d/simspark/naosoccersim.rb 2009-03-18 07:26:56 UTC (rev 57)
+++ trunk/rcssserver3d/simspark/naosoccersim.rb 2009-04-07 08:21:33 UTC (rev 58)
@@ -59,9 +59,9 @@
# soccer rule parameters
addSoccerVar('RuleGoalPauseTime',3.0)
addSoccerVar('RuleKickInPauseTime',1.0)
-addSoccerVar('RuleHalfTime',8.0 * 60)
+addSoccerVar('RuleHalfTime',5.0 * 60)
addSoccerVar('RuleDropBallTime',30)
-addSoccerVar('SingleHalfTime', true)
+addSoccerVar('SingleHalfTime', false)
addSoccerVar('UseOffside',false)
# recorders
@@ -83,6 +83,11 @@
gameControlServer.initControlAspect('GameStateAspect')
gameControlServer.initControlAspect('BallStateAspect')
gameControlServer.initControlAspect('SoccerRuleAspect')
+ obj = get('/sys/server/gamecontrol/GameStateAspect')
+ if (obj != nil)
+ obj.setTime(0)
+ obj.setScores(0,0)
+ end
end
# init monitorItems to transmit game state information
Modified: trunk/spark/cmake/FindODE.cmake
===================================================================
--- trunk/spark/cmake/FindODE.cmake 2009-03-18 07:26:56 UTC (rev 57)
+++ trunk/spark/cmake/FindODE.cmake 2009-04-07 08:21:33 UTC (rev 58)
@@ -3,10 +3,53 @@
# ODE_INCLUDE_DIR - where the directory containing the ODE headers can be
# found
# ODE_LIBRARY - full path to the ODE library
+# ODE_CFLAGS - additional compiler flags for ODE
# ODE_FOUND - TRUE if ODE was found
IF (NOT ODE_FOUND)
+ FIND_PROGRAM(ODE_CONFIG ode-config)
+ IF(ODE_CONFIG)
+ # Use the newer EXECUTE_PROCESS command if it is available.
+ IF(COMMAND EXECUTE_PROCESS)
+ EXECUTE_PROCESS(
+ COMMAND ${ODE_CONFIG} --cflags
+ OUTPUT_VARIABLE ODE_CONFIG_CFLAGS
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ RESULT_VARIABLE ODE_CONFIG_RESULT
+ )
+ ELSE(COMMAND EXECUTE_PROCESS)
+ EXEC_PROGRAM(${ODE_CONFIG} ARGS "--cflags"
+ OUTPUT_VARIABLE ODE_CONFIG_CFLAGS
+ RETURN_VALUE ODE_CONFIG_RESULT
+ )
+ ENDIF(COMMAND EXECUTE_PROCESS)
+
+ # Parse the include flags.
+ IF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ # Convert the compile flags to a CMake list.
+ STRING(REGEX REPLACE " +" ";"
+ ODE_CONFIG_CFLAGS "${ODE_CONFIG_CFLAGS}")
+
+ # Look for -D options.
+ SET(ODE_EXTRA_CFLAGS)
+ FOREACH(flag ${ODE_CONFIG_CFLAGS})
+ IF("${flag}" MATCHES "^-D")
+ SET(ODE_EXTRA_CFLAGS ${ODE_EXTRA_CFLAGS} "${flag}")
+ ENDIF("${flag}" MATCHES "^-D")
+ ENDFOREACH(flag)
+ ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ MESSAGE("Error running ${ODE_CONFIG}: [${ODE_CONFIG_RESULT}]")
+ ENDIF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ ENDIF(ODE_CONFIG)
+
+ IF (ODE_EXTRA_CFLAGS)
+ SET(ODE_CFLAGS ${ODE_EXTRA_CFLAGS} CACHE STRING "Additional ODE flags")
+ MESSAGE(STATUS "Found additional flags for ODE: ${ODE_CFLAGS}")
+ ELSE (ODE_EXTRA_CFLAGS)
+ SET(ODE_CFLAGS CACHE STRING "Additional ODE flags")
+ ENDIF (ODE_EXTRA_CFLAGS)
+
FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
/usr/include
/usr/local/include
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-18 07:26:56 UTC (rev 57)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2009-04-07 08:21:33 UTC (rev 58)
@@ -218,6 +218,7 @@
)
endif(SPADES_FOUND)
+add_definitions(${ODE_CFLAGS})
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility/)
add_library(oxygen ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-03-18 07:27:15
|
Revision: 57
http://simspark.svn.sourceforge.net/simspark/?rev=57&view=rev
Author: hedayat
Date: 2009-03-18 07:26:56 +0000 (Wed, 18 Mar 2009)
Log Message:
-----------
Almost complete windows support
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/cmake/FindSpark.cmake
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
trunk/spark/CMakeLists.txt
trunk/spark/cmake/FindRuby.cmake
trunk/spark/lib/CMakeLists.txt
trunk/spark/lib/kerosin/fontserver/font.h
trunk/spark/lib/kerosin/fontserver/fontserver.h
trunk/spark/lib/kerosin/fontserver/glyph.h
trunk/spark/lib/kerosin/imageserver/image.h
trunk/spark/lib/kerosin/imageserver/imageserver.h
trunk/spark/lib/kerosin/inputserver/input.h
trunk/spark/lib/kerosin/inputserver/inputcontrol.h
trunk/spark/lib/kerosin/inputserver/inputdevice.h
trunk/spark/lib/kerosin/inputserver/inputitem.h
trunk/spark/lib/kerosin/inputserver/inputserver.h
trunk/spark/lib/kerosin/inputserver/inputsystem.h
trunk/spark/lib/kerosin/inputserver/scancodemap.h
trunk/spark/lib/kerosin/materialserver/material.h
trunk/spark/lib/kerosin/materialserver/material2dtexture.h
trunk/spark/lib/kerosin/materialserver/materialexternal.h
trunk/spark/lib/kerosin/materialserver/materialserver.h
trunk/spark/lib/kerosin/materialserver/materialsolid.h
trunk/spark/lib/kerosin/openglserver/openglserver.h
trunk/spark/lib/kerosin/renderserver/baserenderserver.h
trunk/spark/lib/kerosin/renderserver/customrender.h
trunk/spark/lib/kerosin/renderserver/rendercontrol.h
trunk/spark/lib/kerosin/renderserver/rendernode.h
trunk/spark/lib/kerosin/renderserver/renderserver.h
trunk/spark/lib/kerosin/sceneserver/axis.h
trunk/spark/lib/kerosin/sceneserver/box.h
trunk/spark/lib/kerosin/sceneserver/ccylinder.h
trunk/spark/lib/kerosin/sceneserver/cylinder.h
trunk/spark/lib/kerosin/sceneserver/light.h
trunk/spark/lib/kerosin/sceneserver/singlematnode.h
trunk/spark/lib/kerosin/sceneserver/sphere.h
trunk/spark/lib/kerosin/sceneserver/staticmesh.h
trunk/spark/lib/kerosin/soundserver/soundserver.h
trunk/spark/lib/kerosin/textureserver/texture.h
trunk/spark/lib/kerosin/textureserver/texture2d.h
trunk/spark/lib/kerosin/textureserver/textureserver.h
trunk/spark/lib/oxygen/gamecontrolserver/predicate.h
trunk/spark/lib/oxygen/sceneserver/basenode.h
trunk/spark/lib/oxygen/sceneserver/camera.h
trunk/spark/lib/oxygen/sceneserver/fpscontroller.h
trunk/spark/lib/oxygen/sceneserver/scene.h
trunk/spark/lib/oxygen/sceneserver/scenedict.h
trunk/spark/lib/oxygen/sceneserver/sceneserver.h
trunk/spark/lib/oxygen/sceneserver/transform.h
trunk/spark/lib/oxygen/simulationserver/agentcontrol.h
trunk/spark/lib/oxygen/simulationserver/monitorcontrol.h
trunk/spark/lib/oxygen/simulationserver/monitorlogger.h
trunk/spark/lib/oxygen/simulationserver/netbuffer.h
trunk/spark/lib/oxygen/simulationserver/netclient.h
trunk/spark/lib/oxygen/simulationserver/netcontrol.h
trunk/spark/lib/oxygen/simulationserver/netmessage.h
trunk/spark/lib/oxygen/simulationserver/simcontrolnode.h
trunk/spark/lib/oxygen/simulationserver/simulationserver.h
trunk/spark/lib/oxygen/simulationserver/traincontrol.h
trunk/spark/lib/oxygen/spadesserver/paramreader.h
trunk/spark/lib/oxygen/spadesserver/paramstorer.h
trunk/spark/lib/oxygen/spadesserver/spadesactevent.h
trunk/spark/lib/oxygen/spadesserver/spadescreatesenseevent.h
trunk/spark/lib/oxygen/spadesserver/spadesserver.h
trunk/spark/plugin/CMakeLists.txt
trunk/spark/plugin/perfectvisionperceptor/perfectvisionperceptor_c.cpp
trunk/spark/spark/spark.h
trunk/spark/utility/rcssnet/CMakeLists.txt
trunk/spark/utility/tinyxml/CMakeLists.txt
trunk/spark/utility/tinyxml/tinyxml.h
trunk/spark/utility/tinyxml/xmlfunctions.h
Added Paths:
-----------
trunk/rcssserver3d/cmake/FindDevIL.cmake
trunk/rcssserver3d/cmake/FindODE.cmake
trunk/rcssserver3d/windows/include/
trunk/rcssserver3d/windows/include/GL/
trunk/rcssserver3d/windows/include/GL/glext.h
trunk/rcssserver3d/windows/include/GL/glxext.h
trunk/rcssserver3d/windows/include/GL/wglext.h
trunk/spark/utility/tinyxml/tinyxml_defines.h
Removed Paths:
-------------
trunk/spark/windows/simspark.iss
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-03-17 18:03:47 UTC (rev 56)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-03-18 07:26:56 UTC (rev 57)
@@ -10,12 +10,17 @@
check_include_file("arpa/inet.h" HAVE_ARPA_INET_H)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
+set(ENV{SDLDIR} $ENV{SDLDIR} C:/library/SDL/ "C:/Program Files/SDL/" C:/SDL/)
+
find_package(Spark REQUIRED)
find_package(Freetype REQUIRED)
find_package(Boost REQUIRED)
+find_package(SDL REQUIRED)
+find_package(DevIL REQUIRED)
+find_package(ODE REQUIRED)
find_package(OpenGL REQUIRED)
-find_package(SDL REQUIRED)
+
########## add extra flags ##########
if(NOT CMAKE_BUILD_TYPE)
set (CMAKE_BUILD_TYPE Release)
@@ -23,6 +28,7 @@
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
if (UNIX)
set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
STRING "Common C++ compiler flags" FORCE)
@@ -31,6 +37,14 @@
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE
STRING "C++ compiler flags for Release builds" FORCE)
endif (UNIX)
+if(WIN32)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS -DBOOST_ALL_DYN_LINK)
+ include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/windows/include)
+ if(MSVC)
+ add_definitions(/Gm /Zi /GL)
+ endif(MSVC)
+endif(WIN32)
set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")
set(LIBDIR "lib" CACHE PATH "The directory to install libraries into.")
@@ -49,7 +63,7 @@
elseif (UNIX)
set(BUNDLE_PATH ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME})
else (APPLE)
- set(BUNDLE_PATH .)
+ set(BUNDLE_PATH ../share/${CMAKE_PROJECT_NAME})
endif (APPLE)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rcssserver3d_config.h.cmake
@@ -81,6 +95,7 @@
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
########### CPack section #############
+include(InstallRequiredSystemLibraries)
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_SOURCE_IGNORE_FILES
/CVS/ /[.]svn/ /.*[.]o$ /.*[.]o/ /autom4te[.]cache/ /[.].* /bootstrap
@@ -89,6 +104,15 @@
set(CPACK_SOURCE_PACKAGE_FILE_NAME
${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION})
+set(CPACK_PACKAGE_VENDOR "RoboCup Soccer Server 3D Maintenance Group")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "RoboCup Soccer Simulation Server 3D")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README")
+set(CPACK_NSIS_HELP_LINK "TODO:simspark wiki link")
+set(CPACK_NSIS_URL_INFO_ABOUT "http://simspark.sourceforge.net")
+set(CPACK_NSIS_CONTACT "sim...@li...")
+
include(CPack)
#original Makefile.am contents follow:
Added: trunk/rcssserver3d/cmake/FindDevIL.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindDevIL.cmake (rev 0)
+++ trunk/rcssserver3d/cmake/FindDevIL.cmake 2009-03-18 07:26:56 UTC (rev 57)
@@ -0,0 +1,123 @@
+# -Try to find DevIL (developer image) library
+# formerly known as OpenIL, see
+# http://openil.sourceforge.net
+#
+# Once run this will define:
+#
+# DevIL_FOUND
+# DevIL_INCLUDE_DIR
+# DevIL_LIBRARIES
+#
+# Jan Woetzel 12/2005.
+#
+# www.mip.informatik.uni-kiel.de/~jw
+# --------------------------------
+
+# base dirs:
+SET(DevIL_POSSIBLE_ROOT_PATHS
+ ${DevIL_ROOT_DIR}
+ $ENV{DevIL_ROOT_DIR}
+ ${DevIL_DIR}
+ $ENV{DevIL_DIR}
+ ${DEVIL_DIR}
+ $ENV{DEVIL_DIR}
+ ${DEVIL_HOME}
+ $ENV{DEVIL_HOME}
+ "$ENV{EXTERN_LIBS_DIR}/DevIL"
+ $ENV{EXTRA_DIR}
+ $ENV{EXTRA}
+ $ENV{ProgramFiles}/DevIL
+ /usr/local/
+ /usr/
+ /opt/net/gcc41/DevIL
+ /opt/net/gcc33/DevIL
+ C:/library/DevIL
+ "C:/Program Files/DevIL"
+ C:/DevIL
+ )
+
+# appended
+SET(DevIL_POSSIBLE_INCDIR_SUFFIXES
+ include
+ DevIL/include )
+SET(DevIL_POSSIBLE_LIBDIR_SUFFIXES
+ lib
+ lib64
+ )
+
+
+
+FIND_PATH(DevIL_INCLUDE_DIR
+ NAMES IL/il.h
+ PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
+ PATH_SUFFIXES ${DevIL_POSSIBLE_INCDIR_SUFFIXES} )
+#MESSAGE("DBG DevIL_INCLUDE_DIR=${DevIL_INCLUDE_DIR}")
+
+
+FIND_LIBRARY(DevIL_LIBRARY_IL
+ NAMES DevIL devil DevIL IL
+ PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
+ PATH_SUFFIXES ${DevIL_POSSIBLE_LIBDIR_SUFFIXES} )
+#MESSAGE("DBG DevIL_LIBRARY_IL=${DevIL_LIBRARY_IL}")
+
+FIND_LIBRARY(DevIL_LIBRARY_ILU
+ NAMES ILU ilu Ilu
+ PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
+ PATH_SUFFIXES ${DevIL_POSSIBLE_LIBDIR_SUFFIXES} )
+#MESSAGE("DBG DevIL_LIBRARY_ILU=${DevIL_LIBRARY_ILU}")
+
+FIND_LIBRARY(DevIL_LIBRARY_ILUT
+ NAMES ILUT ilu Ilut
+ PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
+ PATH_SUFFIXES ${DevIL_POSSIBLE_LIBDIR_SUFFIXES} )
+#MESSAGE("DBG DevIL_LIBRARY_ILUT=${DevIL_LIBRARY_ILUT}")
+
+
+
+# --------------------------------
+
+IF (DevIL_INCLUDE_DIR)
+ IF (DevIL_LIBRARY_IL)
+ IF (DevIL_LIBRARY_ILU)# AND DevIL_LIBRARY_ILUT)
+
+ SET(DevIL_FOUND TRUE)
+ SET(DevIL_LIBRARIES
+ ${DevIL_LIBRARY_IL}
+ ${DevIL_LIBRARY_ILU})
+ IF (DevIL_LIBRARY_ILUT)
+ SET(DevIL_LIBRARIES ${DevIL_LIBRARIES} ${DevIL_LIBRARY_ILUT})
+ ENDIF (DevIL_LIBRARY_ILUT)
+
+ # get the link directory for rpath to be used with LINK_DIRECTORIES:
+ GET_FILENAME_COMPONENT(DevIL_LINK_DIRECTORIES ${DevIL_LIBRARY_IL} PATH)
+
+ ENDIF(DevIL_LIBRARY_ILU)# AND DevIL_LIBRARY_ILUT)
+ ENDIF(DevIL_LIBRARY_IL)
+ENDIF (DevIL_INCLUDE_DIR)
+
+
+MARK_AS_ADVANCED(
+ DevIL_INCLUDE_DIR
+ DevIL_LIBRARY_IL
+ DevIL_LIBRARY_ILU
+ DevIL_LIBRARY_ILUT
+ DevIL_LIBRARIES
+ )
+
+
+# ==========================================
+IF(NOT DevIL_FOUND)
+ # make FIND_PACKAGE friendly
+ IF(NOT DevIL_FIND_QUIETLY)
+ IF(DevIL_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "DevIL required, please specify it's location.")
+ ELSE(DevIL_FIND_REQUIRED)
+ MESSAGE(STATUS "ERROR: DevIL was not found.")
+ ENDIF(DevIL_FIND_REQUIRED)
+ ENDIF(NOT DevIL_FIND_QUIETLY)
+ENDIF(NOT DevIL_FOUND)
+
+# backward compatibility
+SET(DEVIL_FOUND ${DevIL_FOUND})
+SET(DEVIL_LIBRARIES ${DevIL_LIBRARIES})
+SET(DEVIL_INCLUDE_DIR ${DevIL_INCLUDE_DIR})
Added: trunk/rcssserver3d/cmake/FindODE.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindODE.cmake (rev 0)
+++ trunk/rcssserver3d/cmake/FindODE.cmake 2009-03-18 07:26:56 UTC (rev 57)
@@ -0,0 +1,56 @@
+# find ODE (Open Dynamics Engine) includes and library
+#
+# ODE_INCLUDE_DIR - where the directory containing the ODE headers can be
+# found
+# ODE_LIBRARY - full path to the ODE library
+# ODE_FOUND - TRUE if ODE was found
+
+IF (NOT ODE_FOUND)
+
+ FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
+ /usr/include
+ /usr/local/include
+ $ENV{OGRE_HOME}/include # OGRE SDK on WIN32
+ $ENV{INCLUDE}
+ C:/library/ode/include
+ "C:/Program Files/ode/include"
+ C:/ode/include
+ )
+ FIND_LIBRARY(ODE_LIBRARY
+ NAMES ode ode_double ode_single
+ PATHS
+ /usr/lib
+ /usr/lib64
+ /usr/local/lib
+ $ENV{OGRE_HOME}/lib # OGRE SDK on WIN32
+ C:/library/ode/lib/
+ "C:/Program Files/ode/lib/"
+ C:/ode/lib/
+ PATH_SUFFIXES
+ releaselib
+ ReleaseDoubleDLL ReleaseDoubleLib
+ ReleaseSingleDLL ReleaseSingleLib
+ )
+
+ IF(ODE_INCLUDE_DIR)
+ MESSAGE(STATUS "Found ODE include dir: ${ODE_INCLUDE_DIR}")
+ ELSE(ODE_INCLUDE_DIR)
+ MESSAGE(STATUS "Could NOT find ODE headers.")
+ ENDIF(ODE_INCLUDE_DIR)
+
+ IF(ODE_LIBRARY)
+ MESSAGE(STATUS "Found ODE library: ${ODE_LIBRARY}")
+ ELSE(ODE_LIBRARY)
+ MESSAGE(STATUS "Could NOT find ODE library.")
+ ENDIF(ODE_LIBRARY)
+
+ IF(ODE_INCLUDE_DIR AND ODE_LIBRARY)
+ SET(ODE_FOUND TRUE CACHE STRING "Whether ODE was found or not")
+ ELSE(ODE_INCLUDE_DIR AND ODE_LIBRARY)
+ SET(ODE_FOUND FALSE)
+ IF(ODE_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find ODE. Please install ODE (http://www.ode.org)")
+ ENDIF(ODE_FIND_REQUIRED)
+ ENDIF(ODE_INCLUDE_DIR AND ODE_LIBRARY)
+ENDIF (NOT ODE_FOUND)
+
Modified: trunk/rcssserver3d/cmake/FindSpark.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindSpark.cmake 2009-03-17 18:03:47 UTC (rev 56)
+++ trunk/rcssserver3d/cmake/FindSpark.cmake 2009-03-18 07:26:56 UTC (rev 57)
@@ -27,10 +27,16 @@
SET(SPARK_FIND_QUIETLY TRUE)
ENDIF (SPARK_INCLUDE_DIR)
-FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h PATH_SUFFIXES simspark)
+SET(SPARK_DIR $ENV{SPARK_DIR} "C:/Program Files/simspark" "C:/Library/simspark")
+FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
+
SET(SPARK_NAMES spark spark_debug)
-FIND_LIBRARY(SPARK_LIBRARY NAMES ${SPARK_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(SPARK_LIBRARY NAMES ${SPARK_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
GET_FILENAME_COMPONENT(SPARK_LIB_DIR ${SPARK_LIBRARY} PATH)
# handle the QUIETLY and REQUIRED arguments and set SPARK_FOUND to TRUE if
@@ -53,10 +59,14 @@
SET(SALT_FIND_QUIETLY TRUE)
ENDIF (SALT_INCLUDE_DIR)
-FIND_PATH(SALT_INCLUDE_DIR salt/salt.h PATH_SUFFIXES simspark)
+FIND_PATH(SALT_INCLUDE_DIR salt/salt.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(SALT_NAMES salt salt_debug)
-FIND_LIBRARY(SALT_LIBRARY NAMES ${SALT_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(SALT_LIBRARY NAMES ${SALT_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set SALT_FOUND to TRUE if
# all listed variables are TRUE
@@ -78,10 +88,14 @@
SET(ZEITGEIST_FIND_QUIETLY TRUE)
ENDIF (ZEITGEIST_INCLUDE_DIR)
-FIND_PATH(ZEITGEIST_INCLUDE_DIR zeitgeist/zeitgeist.h PATH_SUFFIXES simspark)
+FIND_PATH(ZEITGEIST_INCLUDE_DIR zeitgeist/zeitgeist.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(ZEITGEIST_NAMES zeitgeist zeitgeist_debug)
-FIND_LIBRARY(ZEITGEIST_LIBRARY NAMES ${ZEITGEIST_NAMES} PATH_SUFFIXES simspark)
+FIND_LIBRARY(ZEITGEIST_LIBRARY NAMES ${ZEITGEIST_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set ZEITGEIST_FOUND to TRUE if
# all listed variables are TRUE
@@ -103,10 +117,14 @@
SET(OXYGEN_FIND_QUIETLY TRUE)
ENDIF (OXYGEN_INCLUDE_DIR)
-FIND_PATH(OXYGEN_INCLUDE_DIR oxygen/oxygen.h PATH_SUFFIXES simspark)
+FIND_PATH(OXYGEN_INCLUDE_DIR oxygen/oxygen.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(OXYGEN_NAMES oxygen oxygen_debug)
-FIND_LIBRARY(OXYGEN_LIBRARY NAMES ${OXYGEN_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(OXYGEN_LIBRARY NAMES ${OXYGEN_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set OXYGEN_FOUND to TRUE if
# all listed variables are TRUE
@@ -128,10 +146,14 @@
SET(KEROSIN_FIND_QUIETLY TRUE)
ENDIF (KEROSIN_INCLUDE_DIR)
-FIND_PATH(KEROSIN_INCLUDE_DIR kerosin/kerosin.h PATH_SUFFIXES simspark)
+FIND_PATH(KEROSIN_INCLUDE_DIR kerosin/kerosin.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(KEROSIN_NAMES kerosin kerosin_debug)
-FIND_LIBRARY(KEROSIN_LIBRARY NAMES ${KEROSIN_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(KEROSIN_LIBRARY NAMES ${KEROSIN_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set KEROSIN_FOUND to TRUE if
# all listed variables are TRUE
@@ -153,10 +175,14 @@
SET(RCSSNET3D_FIND_QUIETLY TRUE)
ENDIF (RCSSNET3D_INCLUDE_DIR)
-FIND_PATH(RCSSNET3D_INCLUDE_DIR rcssnet/addr.hpp PATH_SUFFIXES simspark)
+FIND_PATH(RCSSNET3D_INCLUDE_DIR rcssnet/addr.hpp
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(RCSSNET3D_NAMES rcssnet3D rcssnet3D_debug)
-FIND_LIBRARY(RCSSNET3D_LIBRARY NAMES ${RCSSNET3D_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(RCSSNET3D_LIBRARY NAMES ${RCSSNET3D_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set RCSSNET3D_FOUND to TRUE if
# all listed variables are TRUE
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-03-17 18:03:47 UTC (rev 56)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-03-18 07:26:56 UTC (rev 57)
@@ -111,7 +111,7 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${SPARK_INCLUDE_DIR}
${SALT_INCLUDE_DIR} ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR}
- ${KEROSIN_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
+ ${KEROSIN_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR})
add_library(soccer MODULE ${soccer_LIB_SRCS} ${soccer_LIB_HDRS})
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-03-17 18:03:47 UTC (rev 56)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-03-18 07:26:56 UTC (rev 57)
@@ -20,7 +20,7 @@
include_directories(${CMAKE_SOURCE_DIR}/plugin ${SPARK_INCLUDE_DIR}
${SALT_INCLUDE_DIR} ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR}
- ${KEROSIN_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
+ ${KEROSIN_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR})
add_library(soccermonitor MODULE ${soccermonitor_LIB_SRCS}
${soccermonitor_LIB_HDRS})
Modified: trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-03-17 18:03:47 UTC (rev 56)
+++ trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-03-18 07:26:56 UTC (rev 57)
@@ -18,9 +18,13 @@
add_executable(rcssagent3d ${rcssagent3d_SRCS})
+if (WIN32)
+ set(NET_LIBS WS2_32.lib)
+endif (WIN32)
+
target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
- ${RCSSNET3D_LIBRARIES})
+ ${RCSSNET3D_LIBRARIES} ${NET_LIBS})
set_target_properties(rcssagent3d PROPERTIES
INSTALL_RPATH "${RPATH_DIRECTORIES}")
Added: trunk/rcssserver3d/windows/include/GL/glext.h
===================================================================
--- trunk/rcssserver3d/windows/include/GL/glext.h (rev 0)
+++ trunk/rcssserver3d/windows/include/GL/glext.h 2009-03-18 07:26:56 UTC (rev 57)
@@ -0,0 +1,8395 @@
+#ifndef __glext_h_
+#define __glext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/*************************************************************/
+
+/* Header file version number, required by OpenGL ABI for Linux */
+/* glext.h last updated 2008/08/16 */
+/* Current version at http://www.opengl.org/registry/ */
+#define GL_GLEXT_VERSION 42
+
+#ifndef GL_VERSION_1_2
+#define GL_UNSIGNED_BYTE_3_3_2 0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
+#define GL_UNSIGNED_INT_8_8_8_8 0x8035
+#define GL_UNSIGNED_INT_10_10_10_2 0x8036
+#define GL_RESCALE_NORMAL 0x803A
+#define GL_TEXTURE_BINDING_3D 0x806A
+#define GL_PACK_SKIP_IMAGES 0x806B
+#define GL_PACK_IMAGE_HEIGHT 0x806C
+#define GL_UNPACK_SKIP_IMAGES 0x806D
+#define GL_UNPACK_IMAGE_HEIGHT 0x806E
+#define GL_TEXTURE_3D 0x806F
+#define GL_PROXY_TEXTURE_3D 0x8070
+#define GL_TEXTURE_DEPTH 0x8071
+#define GL_TEXTURE_WRAP_R 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE 0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362
+#define GL_UNSIGNED_SHORT_5_6_5 0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
+#define GL_BGR 0x80E0
+#define GL_BGRA 0x80E1
+#define GL_MAX_ELEMENTS_VERTICES 0x80E8
+#define GL_MAX_ELEMENTS_INDICES 0x80E9
+#define GL_CLAMP_TO_EDGE 0x812F
+#define GL_TEXTURE_MIN_LOD 0x813A
+#define GL_TEXTURE_MAX_LOD 0x813B
+#define GL_TEXTURE_BASE_LEVEL 0x813C
+#define GL_TEXTURE_MAX_LEVEL 0x813D
+#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8
+#define GL_SINGLE_COLOR 0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR 0x81FA
+#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE 0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
+#endif
+
+#ifndef GL_ARB_imaging
+#define GL_CONSTANT_COLOR 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
+#define GL_CONSTANT_ALPHA 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
+#define GL_BLEND_COLOR 0x8005
+#define GL_FUNC_ADD 0x8006
+#define GL_MIN 0x8007
+#define GL_MAX 0x8008
+#define GL_BLEND_EQUATION 0x8009
+#define GL_FUNC_SUBTRACT 0x800A
+#define GL_FUNC_REVERSE_SUBTRACT 0x800B
+#define GL_CONVOLUTION_1D 0x8010
+#define GL_CONVOLUTION_2D 0x8011
+#define GL_SEPARABLE_2D 0x8012
+#define GL_CONVOLUTION_BORDER_MODE 0x8013
+#define GL_CONVOLUTION_FILTER_SCALE 0x8014
+#define GL_CONVOLUTION_FILTER_BIAS 0x8015
+#define GL_REDUCE 0x8016
+#define GL_CONVOLUTION_FORMAT 0x8017
+#define GL_CONVOLUTION_WIDTH 0x8018
+#define GL_CONVOLUTION_HEIGHT 0x8019
+#define GL_MAX_CONVOLUTION_WIDTH 0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT 0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS 0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023
+#define GL_HISTOGRAM 0x8024
+#define GL_PROXY_HISTOGRAM 0x8025
+#define GL_HISTOGRAM_WIDTH 0x8026
+#define GL_HISTOGRAM_FORMAT 0x8027
+#define GL_HISTOGRAM_RED_SIZE 0x8028
+#define GL_HISTOGRAM_GREEN_SIZE 0x8029
+#define GL_HISTOGRAM_BLUE_SIZE 0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE 0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C
+#define GL_HISTOGRAM_SINK 0x802D
+#define GL_MINMAX 0x802E
+#define GL_MINMAX_FORMAT 0x802F
+#define GL_MINMAX_SINK 0x8030
+#define GL_TABLE_TOO_LARGE 0x8031
+#define GL_COLOR_MATRIX 0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB
+#define GL_COLOR_TABLE 0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2
+#define GL_PROXY_COLOR_TABLE 0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE 0x80D6
+#define GL_COLOR_TABLE_BIAS 0x80D7
+#define GL_COLOR_TABLE_FORMAT 0x80D8
+#define GL_COLOR_TABLE_WIDTH 0x80D9
+#define GL_COLOR_TABLE_RED_SIZE 0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF
+#define GL_CONSTANT_BORDER 0x8151
+#define GL_REPLICATE_BORDER 0x8153
+#define GL_CONVOLUTION_BORDER_COLOR 0x8154
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_TEXTURE0 0x84C0
+#define GL_TEXTURE1 0x84C1
+#define GL_TEXTURE2 0x84C2
+#define GL_TEXTURE3 0x84C3
+#define GL_TEXTURE4 0x84C4
+#define GL_TEXTURE5 0x84C5
+#define GL_TEXTURE6 0x84C6
+#define GL_TEXTURE7 0x84C7
+#define GL_TEXTURE8 0x84C8
+#define GL_TEXTURE9 0x84C9
+#define GL_TEXTURE10 0x84CA
+#define GL_TEXTURE11 0x84CB
+#define GL_TEXTURE12 0x84CC
+#define GL_TEXTURE13 0x84CD
+#define GL_TEXTURE14 0x84CE
+#define GL_TEXTURE15 0x84CF
+#define GL_TEXTURE16 0x84D0
+#define GL_TEXTURE17 0x84D1
+#define GL_TEXTURE18 0x84D2
+#define GL_TEXTURE19 0x84D3
+#define GL_TEXTURE20 0x84D4
+#define GL_TEXTURE21 0x84D5
+#define GL_TEXTURE22 0x84D6
+#define GL_TEXTURE23 0x84D7
+#define GL_TEXTURE24 0x84D8
+#define GL_TEXTURE25 0x84D9
+#define GL_TEXTURE26 0x84DA
+#define GL_TEXTURE27 0x84DB
+#define GL_TEXTURE28 0x84DC
+#define GL_TEXTURE29 0x84DD
+#define GL_TEXTURE30 0x84DE
+#define GL_TEXTURE31 0x84DF
+#define GL_ACTIVE_TEXTURE 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1
+#define GL_MAX_TEXTURE_UNITS 0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6
+#define GL_MULTISAMPLE 0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE 0x809F
+#define GL_SAMPLE_COVERAGE 0x80A0
+#define GL_SAMPLE_BUFFERS 0x80A8
+#define GL_SAMPLES 0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE 0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT 0x80AB
+#define GL_MULTISAMPLE_BIT 0x20000000
+#define GL_NORMAL_MAP 0x8511
+#define GL_REFLECTION_MAP 0x8512
+#define GL_TEXTURE_CUBE_MAP 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C
+#define GL_COMPRESSED_ALPHA 0x84E9
+#define GL_COMPRESSED_LUMINANCE 0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB
+#define GL_COMPRESSED_INTENSITY 0x84EC
+#define GL_COMPRESSED_RGB 0x84ED
+#define GL_COMPRESSED_RGBA 0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT 0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0
+#define GL_TEXTURE_COMPRESSED 0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
+#define GL_CLAMP_TO_BORDER 0x812D
+#define GL_COMBINE 0x8570
+#define GL_COMBINE_RGB 0x8571
+#define GL_COMBINE_ALPHA 0x8572
+#define GL_SOURCE0_RGB 0x8580
+#define GL_SOURCE1_RGB 0x8581
+#define GL_SOURCE2_RGB 0x8582
+#define GL_SOURCE0_ALPHA 0x8588
+#define GL_SOURCE1_ALPHA 0x8589
+#define GL_SOURCE2_ALPHA 0x858A
+#define GL_OPERAND0_RGB 0x8590
+#define GL_OPERAND1_RGB 0x8591
+#define GL_OPERAND2_RGB 0x8592
+#define GL_OPERAND0_ALPHA 0x8598
+#define GL_OPERAND1_ALPHA 0x8599
+#define GL_OPERAND2_ALPHA 0x859A
+#define GL_RGB_SCALE 0x8573
+#define GL_ADD_SIGNED 0x8574
+#define GL_INTERPOLATE 0x8575
+#define GL_SUBTRACT 0x84E7
+#define GL_CONSTANT 0x8576
+#define GL_PRIMARY_COLOR 0x8577
+#define GL_PREVIOUS 0x8578
+#define GL_DOT3_RGB 0x86AE
+#define GL_DOT3_RGBA 0x86AF
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_BLEND_DST_RGB 0x80C8
+#define GL_BLEND_SRC_RGB 0x80C9
+#define GL_BLEND_DST_ALPHA 0x80CA
+#define GL_BLEND_SRC_ALPHA 0x80CB
+#define GL_POINT_SIZE_MIN 0x8126
+#define GL_POINT_SIZE_MAX 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128
+#define GL_POINT_DISTANCE_ATTENUATION 0x8129
+#define GL_GENERATE_MIPMAP 0x8191
+#define GL_GENERATE_MIPMAP_HINT 0x8192
+#define GL_DEPTH_COMPONENT16 0x81A5
+#define GL_DEPTH_COMPONENT24 0x81A6
+#define GL_DEPTH_COMPONENT32 0x81A7
+#define GL_MIRRORED_REPEAT 0x8370
+#define GL_FOG_COORDINATE_SOURCE 0x8450
+#define GL_FOG_COORDINATE 0x8451
+#define GL_FRAGMENT_DEPTH 0x8452
+#define GL_CURRENT_FOG_COORDINATE 0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456
+#define GL_FOG_COORDINATE_ARRAY 0x8457
+#define GL_COLOR_SUM 0x8458
+#define GL_CURRENT_SECONDARY_COLOR 0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D
+#define GL_SECONDARY_COLOR_ARRAY 0x845E
+#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD
+#define GL_TEXTURE_FILTER_CONTROL 0x8500
+#define GL_TEXTURE_LOD_BIAS 0x8501
+#define GL_INCR_WRAP 0x8507
+#define GL_DECR_WRAP 0x8508
+#define GL_TEXTURE_DEPTH_SIZE 0x884A
+#define GL_DEPTH_TEXTURE_MODE 0x884B
+#define GL_TEXTURE_COMPARE_MODE 0x884C
+#define GL_TEXTURE_COMPARE_FUNC 0x884D
+#define GL_COMPARE_R_TO_TEXTURE 0x884E
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_BUFFER_SIZE 0x8764
+#define GL_BUFFER_USAGE 0x8765
+#define GL_QUERY_COUNTER_BITS 0x8864
+#define GL_CURRENT_QUERY 0x8865
+#define GL_QUERY_RESULT 0x8866
+#define GL_QUERY_RESULT_AVAILABLE 0x8867
+#define GL_ARRAY_BUFFER 0x8892
+#define GL_ELEMENT_ARRAY_BUFFER 0x8893
+#define GL_ARRAY_BUFFER_BINDING 0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY 0x88B8
+#define GL_WRITE_ONLY 0x88B9
+#define GL_READ_WRITE 0x88BA
+#define GL_BUFFER_ACCESS 0x88BB
+#define GL_BUFFER_MAPPED 0x88BC
+#define GL_BUFFER_MAP_POINTER 0x88BD
+#define GL_STREAM_DRAW 0x88E0
+#define GL_STREAM_READ 0x88E1
+#define GL_STREAM_COPY 0x88E2
+#define GL_STATIC_DRAW 0x88E4
+#define GL_STATIC_READ 0x88E5
+#define GL_STATIC_COPY 0x88E6
+#define GL_DYNAMIC_DRAW 0x88E8
+#define GL_DYNAMIC_READ 0x88E9
+#define GL_DYNAMIC_COPY 0x88EA
+#define GL_SAMPLES_PASSED 0x8914
+#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE
+#define GL_FOG_COORD GL_FOG_COORDINATE
+#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE
+#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE
+#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE
+#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER
+#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
+#define GL_SRC0_RGB GL_SOURCE0_RGB
+#define GL_SRC1_RGB GL_SOURCE1_RGB
+#define GL_SRC2_RGB GL_SOURCE2_RGB
+#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA
+#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA
+#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625
+#define GL_CURRENT_VERTEX_ATTRIB 0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645
+#define GL_STENCIL_BACK_FUNC 0x8800
+#define GL_STENCIL_BACK_FAIL 0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803
+#define GL_MAX_DRAW_BUFFERS 0x8824
+#define GL_DRAW_BUFFER0 0x8825
+#define GL_DRAW_BUFFER1 0x8826
+#define GL_DRAW_BUFFER2 0x8827
+#define GL_DRAW_BUFFER3 0x8828
+#define GL_DRAW_BUFFER4 0x8829
+#define GL_DRAW_BUFFER5 0x882A
+#define GL_DRAW_BUFFER6 0x882B
+#define GL_DRAW_BUFFER7 0x882C
+#define GL_DRAW_BUFFER8 0x882D
+#define GL_DRAW_BUFFER9 0x882E
+#define GL_DRAW_BUFFER10 0x882F
+#define GL_DRAW_BUFFER11 0x8830
+#define GL_DRAW_BUFFER12 0x8831
+#define GL_DRAW_BUFFER13 0x8832
+#define GL_DRAW_BUFFER14 0x8833
+#define GL_DRAW_BUFFER15 0x8834
+#define GL_BLEND_EQUATION_ALPHA 0x883D
+#define GL_POINT_SPRITE 0x8861
+#define GL_COORD_REPLACE 0x8862
+#define GL_MAX_VERTEX_ATTRIBS 0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_COORDS 0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
+#define GL_FRAGMENT_SHADER 0x8B30
+#define GL_VERTEX_SHADER 0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A
+#define GL_MAX_VARYING_FLOATS 0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE 0x8B4F
+#define GL_FLOAT_VEC2 0x8B50
+#define GL_FLOAT_VEC3 0x8B51
+#define GL_FLOAT_VEC4 0x8B52
+#define GL_INT_VEC2 0x8B53
+#define GL_INT_VEC3 0x8B54
+#define GL_INT_VEC4 0x8B55
+#define GL_BOOL 0x8B56
+#define GL_BOOL_VEC2 0x8B57
+#define GL_BOOL_VEC3 0x8B58
+#define GL_BOOL_VEC4 0x8B59
+#define GL_FLOAT_MAT2 0x8B5A
+#define GL_FLOAT_MAT3 0x8B5B
+#define GL_FLOAT_MAT4 0x8B5C
+#define GL_SAMPLER_1D 0x8B5D
+#define GL_SAMPLER_2D 0x8B5E
+#define GL_SAMPLER_3D 0x8B5F
+#define GL_SAMPLER_CUBE 0x8B60
+#define GL_SAMPLER_1D_SHADOW 0x8B61
+#define GL_SAMPLER_2D_SHADOW 0x8B62
+#define GL_DELETE_STATUS 0x8B80
+#define GL_COMPILE_STATUS 0x8B81
+#define GL_LINK_STATUS 0x8B82
+#define GL_VALIDATE_STATUS 0x8B83
+#define GL_INFO_LOG_LENGTH 0x8B84
+#define GL_ATTACHED_SHADERS 0x8B85
+#define GL_ACTIVE_UNIFORMS 0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
+#define GL_SHADER_SOURCE_LENGTH 0x8B88
+#define GL_ACTIVE_ATTRIBUTES 0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION 0x8B8C
+#define GL_CURRENT_PROGRAM 0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0
+#define GL_LOWER_LEFT 0x8CA1
+#define GL_UPPER_LEFT 0x8CA2
+#define GL_STENCIL_BACK_REF 0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK 0x8CA5
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
+#define GL_PIXEL_PACK_BUFFER 0x88EB
+#define GL_PIXEL_UNPACK_BUFFER 0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF
+#define GL_FLOAT_MAT2x3 0x8B65
+#define GL_FLOAT_MAT2x4 0x8B66
+#define GL_FLOAT_MAT3x2 0x8B67
+#define GL_FLOAT_MAT3x4 0x8B68
+#define GL_FLOAT_MAT4x2 0x8B69
+#define GL_FLOAT_MAT4x3 0x8B6A
+#define GL_SRGB 0x8C40
+#define GL_SRGB8 0x8C41
+#define GL_SRGB_ALPHA 0x8C42
+#define GL_SRGB8_ALPHA8 0x8C43
+#define GL_SLUMINANCE_ALPHA 0x8C44
+#define GL_SLUMINANCE8_ALPHA8 0x8C45
+#define GL_SLUMINANCE 0x8C46
+#define GL_SLUMINANCE8 0x8C47
+#define GL_COMPRESSED_SRGB 0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA 0x8C49
+#define GL_COMPRESSED_SLUMINANCE 0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B
+#endif
+
+#ifndef GL_VERSION_3_0
+#define GL_COMPARE_REF_TO_TEXTURE GL_COMPARE_R_TO_TEXTURE_ARB
+#define GL_CLIP_DISTANCE0 GL_CLIP_PLANE0
+#define GL_CLIP_DISTANCE1 GL_CLIP_PLANE1
+#define GL_CLIP_DISTANCE2 GL_CLIP_PLANE2
+#define GL_CLIP_DISTANCE3 GL_CLIP_PLANE3
+#define GL_CLIP_DISTANCE4 GL_CLIP_PLANE4
+#define GL_CLIP_DISTANCE5 GL_CLIP_PLANE5
+#define GL_MAX_CLIP_DISTANCES GL_MAX_CLIP_PLANES
+#define GL_MAJOR_VERSION 0x821B
+#define GL_MINOR_VERSION 0x821C
+#define GL_NUM_EXTENSIONS 0x821D
+#define GL_CONTEXT_FLAGS 0x821E
+#define GL_DEPTH_BUFFER 0x8223
+#define GL_STENCIL_BUFFER 0x8224
+#define GL_COMPRESSED_RED 0x8225
+#define GL_COMPRESSED_RG 0x8226
+#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
+#define GL_RGBA32F 0x8814
+#define GL_RGB32F 0x8815
+#define GL_RGBA16F 0x881A
+#define GL_RGB16F 0x881B
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD
+#define GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF
+#define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905
+#define GL_CLAMP_VERTEX_COLOR 0x891A
+#define GL_CLAMP_FRAGMENT_COLOR 0x891B
+#define GL_CLAMP_READ_COLOR 0x891C
+#define GL_FIXED_ONLY 0x891D
+#define GL_MAX_VARYING_COMPONENTS GL_MAX_VARYING_FLOATS
+#define GL_TEXTURE_RED_TYPE 0x8C10
+#define GL_TEXTURE_GREEN_TYPE 0x8C11
+#define GL_TEXTURE_BLUE_TYPE 0x8C12
+#define GL_TEXTURE_ALPHA_TYPE 0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE 0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE 0x8C15
+#define GL_TEXTURE_DEPTH_TYPE 0x8C16
+#define GL_UNSIGNED_NORMALIZED 0x8C17
+#define GL_TEXTURE_1D_ARRAY 0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY 0x8C19
+#define GL_TEXTURE_2D_ARRAY 0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY 0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY 0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY 0x8C1D
+#define GL_R11F_G11F_B10F 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B
+#define GL_RGB9_E5 0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E
+#define GL_TEXTURE_SHARED_SIZE 0x8C3F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
+#define GL_PRIMITIVES_GENERATED 0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
+#define GL_RASTERIZER_DISCARD 0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS 0x8C8C
+#define GL_SEPARATE_ATTRIBS 0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
+#define GL_RGBA32UI 0x8D70
+#define GL_RGB32UI 0x8D71
+#define GL_RGBA16UI 0x8D76
+#define GL_RGB16UI 0x8D77
+#define GL_RGBA8UI 0x8D7C
+#define GL_RGB8UI 0x8D7D
+#define GL_RGBA32I 0x8D82
+#define GL_RGB32I 0x8D83
+#define GL_RGBA16I 0x8D88
+#define GL_RGB16I 0x8D89
+#define GL_RGBA8I 0x8D8E
+#define GL_RGB8I 0x8D8F
+#define GL_RED_INTEGER 0x8D94
+#define GL_GREEN_INTEGER 0x8D95
+#define GL_BLUE_INTEGER 0x8D96
+#define GL_ALPHA_INTEGER 0x8D97
+#define GL_RGB_INTEGER 0x8D98
+#define GL_RGBA_INTEGER 0x8D99
+#define GL_BGR_INTEGER 0x8D9A
+#define GL_BGRA_INTEGER 0x8D9B
+#define GL_SAMPLER_1D_ARRAY 0x8DC0
+#define GL_SAMPLER_2D_ARRAY 0x8DC1
+#define GL_SAMPLER_1D_ARRAY_SHADOW 0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW 0x8DC5
+#define GL_UNSIGNED_INT_VEC2 0x8DC6
+#define GL_UNSIGNED_INT_VEC3 0x8DC7
+#define GL_UNSIGNED_INT_VEC4 0x8DC8
+#define GL_INT_SAMPLER_1D 0x8DC9
+#define GL_INT_SAMPLER_2D 0x8DCA
+#define GL_INT_SAMPLER_3D 0x8DCB
+#define GL_INT_SAMPLER_CUBE 0x8DCC
+#define GL_INT_SAMPLER_1D_ARRAY 0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY 0x8DCF
+#define GL_UNSIGNED_INT_SAMPLER_1D 0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY 0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY 0x8DD7
+#define GL_QUERY_WAIT 0x8E13
+#define GL_QUERY_NO_WAIT 0x8E14
+#define GL_QUERY_BY_REGION_WAIT 0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT 0x8E16
+/* Reuse tokens from ARB_depth_buffer_float */
+/* reuse GL_DEPTH_COMPONENT32F */
+/* reuse GL_DEPTH32F_STENCIL8 */
+/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
+/* Reuse tokens from ARB_framebuffer_object */
+/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_DEFAULT */
+/* reuse GL_FRAMEBUFFER_UNDEFINED */
+/* reuse GL_DEPTH_STENCIL_ATTACHMENT */
+/* reuse GL_INDEX */
+/* reuse GL_MAX_RENDERBUFFER_SIZE */
+/* reuse GL_DEPTH_STENCIL */
+/* reuse GL_UNSIGNED_INT_24_8 */
+/* reuse GL_DEPTH24_STENCIL8 */
+/* reuse GL_TEXTURE_STENCIL_SIZE */
+/* reuse GL_TEXTURE_RED_TYPE */
+/* reuse GL_TEXTURE_GREEN_TYPE */
+/* reuse GL_TEXTURE_BLUE_TYPE */
+/* reuse GL_TEXTURE_ALPHA_TYPE */
+/* reuse GL_TEXTURE_LUMINANCE_TYPE */
+/* reuse GL_TEXTURE_INTENSITY_TYPE */
+/* reuse GL_TEXTURE_DEPTH_TYPE */
+/* reuse GL_UNSIGNED_NORMALIZED */
+/* reuse GL_FRAMEBUFFER_BINDING */
+/* reuse GL_DRAW_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_BINDING */
+/* reuse GL_READ_FRAMEBUFFER */
+/* reuse GL_DRAW_FRAMEBUFFER */
+/* reuse GL_READ_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_SAMPLES */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+/* reuse GL_FRAMEBUFFER_COMPLETE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+/* reuse GL_FRAMEBUFFER_UNSUPPORTED */
+/* reuse GL_MAX_COLOR_ATTACHMENTS */
+/* reuse GL_COLOR_ATTACHMENT0 */
+/* reuse GL_COLOR_ATTACHMENT1 */
+/* reuse GL_COLOR_ATTACHMENT2 */
+/* reuse GL_COLOR_ATTACHMENT3 */
+/* reuse GL_COLOR_ATTACHMENT4 */
+/* reuse GL_COLOR_ATTACHMENT5 */
+/* reuse GL_COLOR_ATTACHMENT6 */
+/* reuse GL_COLOR_ATTACHMENT7 */
+/* reuse GL_COLOR_ATTACHMENT8 */
+/* reuse GL_COLOR_ATTACHMENT9 */
+/* reuse GL_COLOR_ATTACHMENT10 */
+/* reuse GL_COLOR_ATTACHMENT11 */
+/* reuse GL_COLOR_ATTACHMENT12 */
+/* reuse GL_COLOR_ATTACHMENT13 */
+/* reuse GL_COLOR_ATTACHMENT14 */
+/* reuse GL_COLOR_ATTACHMENT15 */
+/* reuse GL_DEPTH_ATTACHMENT */
+/* reuse GL_STENCIL_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER */
+/* reuse GL_RENDERBUFFER */
+/* reuse GL_RENDERBUFFER_WIDTH */
+/* reuse GL_RENDERBUFFER_HEIGHT */
+/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */
+/* reuse GL_STENCIL_INDEX1 */
+/* reuse GL_STENCIL_INDEX4 */
+/* reuse GL_STENCIL_INDEX8 */
+/* reuse GL_STENCIL_INDEX16 */
+/* reuse GL_RENDERBUFFER_RED_SIZE */
+/* reuse GL_RENDERBUFFER_GREEN_SIZE */
+/* reuse GL_RENDERBUFFER_BLUE_SIZE */
+/* reuse GL_RENDERBUFFER_ALPHA_SIZE */
+/* reuse GL_RENDERBUFFER_DEPTH_SIZE */
+/* reuse GL_RENDERBUFFER_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+/* reuse GL_MAX_SAMPLES */
+/* Reuse tokens from ARB_framebuffer_sRGB */
+/* reuse GL_FRAMEBUFFER_SRGB */
+/* Reuse tokens from ARB_half_float_vertex */
+/* reuse GL_HALF_FLOAT */
+/* Reuse tokens from ARB_map_buffer_range */
+/* reuse GL_MAP_READ_BIT */
+/* reuse GL_MAP_WRITE_BIT */
+/* reuse GL_MAP_INVALIDATE_RANGE_BIT */
+/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */
+/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */
+/* reuse GL_MAP_UNSYNCHRONIZED_BIT */
+/* Reuse tokens from ARB_texture_compression_rgtc */
+/* reuse GL_COMPRESSED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_RG_RGTC2 */
+/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */
+/* Reuse tokens from ARB_texture_rg */
+/* reuse GL_RG */
+/* reuse GL_RG_INTEGER */
+/* reuse GL_R8 */
+/* reuse GL_R16 */
+/* reuse GL_RG8 */
+/* reuse GL_RG16 */
+/* reuse GL_R16F */
+/* reuse GL_R32F */
+/* reuse GL_RG16F */
+/* reuse GL_RG32F */
+/* reuse GL_R8I */
+/* reuse GL_R8UI */
+/* reuse GL_R16I */
+/* reuse GL_R16UI */
+/* reuse GL_R32I */
+/* reuse GL_R32UI */
+/* reuse GL_RG8I */
+/* reuse GL_RG8UI */
+/* reuse GL_RG16I */
+/* reuse GL_RG16UI */
+/* reuse GL_RG32I */
+/* reuse GL_RG32UI */
+/* Reuse tokens from ARB_vertex_array_object */
+/* reuse GL_VERTEX_ARRAY_BINDING */
+#endif
+
+#ifndef GL_ARB_multitexture
+#define GL_TEXTURE0_ARB 0x84C0
+#define GL_TEXTURE1_ARB 0x84C1
+#define GL_TEXTURE2_ARB 0x84C2
+#define GL_TEXTURE3_ARB 0x84C3
+#define GL_TEXTURE4_ARB 0x84C4
+#define GL_TEXTURE5_ARB 0x84C5
+#define GL_TEXTURE6_ARB 0x84C6
+#define GL_TEXTURE7_ARB 0x84C7
+#define GL_TEXTURE8_ARB 0x84C8
+#define GL_TEXTURE9_ARB 0x84C9
+#define GL_TEXTURE10_ARB 0x84CA
+#define GL_TEXTURE11_ARB 0x84CB
+#define GL_TEXTURE12_ARB 0x84CC
+#define GL_TEXTURE13_ARB 0x84CD
+#define GL_TEXTURE14_ARB 0x84CE
+#define GL_TEXTURE15_ARB 0x84CF
+#define GL_TEXTURE16_ARB 0x84D0
+#define GL_TEXTURE17_ARB 0x84D1
+#define GL_TEXTURE18_ARB 0x84D2
+#define GL_TEXTURE19_ARB 0x84D3
+#define GL_TEXTURE20_ARB 0x84D4
+#define GL_TEXTURE21_ARB 0x84D5
+#define GL_TEXTURE22_ARB 0x84D6
+#define GL_TEXTURE23_ARB 0x84D7
+#define GL_TEXTURE24_ARB 0x84D8
+#define GL_TEXTURE25_ARB 0x84D9
+#define GL_TEXTURE26_ARB 0x84DA
+#define GL_TEXTURE27_ARB 0x84DB
+#define GL_TEXTURE28_ARB 0x84DC
+#define GL_TEXTURE29_ARB 0x84DD
+#define GL_TEXTURE30_ARB 0x84DE
+#define GL_TEXTURE31_ARB 0x84DF
+#define GL_ACTIVE_TEXTURE_ARB 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6
+#endif
+
+#ifndef GL_ARB_multisample
+#define GL_MULTISAMPLE_ARB 0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F
+#define GL_SAMPLE_COVERAGE_ARB 0x80A0
+#define GL_SAMPLE_BUFFERS_ARB 0x80A8
+#define GL_SAMPLES_ARB 0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB
+#define GL_MULTISAMPLE_BIT_ARB 0x20000000
+#endif
+
+#ifndef GL_ARB_texture_env_add
+#endif
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_NORMAL_MAP_ARB 0x8511
+#define GL_REFLECTION_MAP_ARB 0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C
+#endif
+
+#ifndef GL_ARB_texture_compression
+#define GL_COMPRESSED_ALPHA_ARB 0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB 0x84EC
+#define GL_COMPRESSED_RGB_ARB 0x84ED
+#define GL_COMPRESSED_RGBA_ARB 0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB 0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+#endif
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_ARB 0x812D
+#endif
+
+#ifndef GL_ARB_point_parameters
+#define GL_POINT_SIZE_MIN_ARB 0x8126
+#define GL_POINT_SIZE_MAX_ARB 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+#endif
+
+#ifndef GL_ARB_vertex_blend
+#define GL_MAX_VERTEX_UNITS_ARB 0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6
+#define GL_VERTEX_BLEND_ARB 0x86A7
+#define GL_CURRENT_WEIGHT_ARB 0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC
+#define GL_WEIGHT_ARRAY_ARB 0x86AD
+#define GL_MODELVIEW0_ARB 0x1700
+#define GL_MODELVIEW1_ARB 0x850A
+#define GL_MODELVIEW2_ARB 0x8722
+#define GL_MODELVIEW3_ARB 0x8723
+#define GL_MODELVIEW4_ARB 0x8724
+#define GL_MODELVIEW5_ARB 0x8725
+#define GL_MODELVIEW6_ARB 0x8726
+#define GL_MODELVIEW7_ARB 0x8727
+#define GL_MODELVIEW8_ARB 0x8728
+#define GL_MODELVIEW9_ARB 0x8729
+#define GL_MODELVIEW10_ARB 0x872A
+#define GL_MODELVIEW11_ARB 0x872B
+#define GL_MODELVIEW12_ARB 0x872C
+#define GL_MODELVIEW13_ARB 0x872D
+#define GL_MODELVIEW14_ARB 0x872E
+#define GL_MODELVIEW15_ARB 0x872F
+#define GL_MODELVIEW16_ARB 0x8730
+#define GL_MODELVIEW17_ARB 0x8731
+#define GL_MODELVIEW18_ARB 0x8732
+#define GL_MODELVIEW19_ARB 0x8733
+#define GL_MODELVIEW20_ARB 0x8734
+#define GL_MODELVIEW21_ARB 0x8735
+#define GL_MODELVIEW22_ARB 0x8736
+#define GL_MODELVIEW23_ARB 0x8737
+#define GL_MODELVIEW24_ARB 0x8738
+#define GL_MODELVIEW25_ARB 0x8739
+#define GL_MODELVIEW26_ARB 0x873A
+#define GL_MODELVIEW27_ARB 0x873B
+#define GL_MODELVIEW28_ARB 0x873C
+#define GL_MODELVIEW29_ARB 0x873D
+#define GL_MODELVIEW30_ARB 0x873E
+#define GL_MODELVIEW31_ARB 0x873F
+#endif
+
+#ifndef GL_ARB_matrix_palette
+#define GL_MATRIX_PALETTE_ARB 0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB 0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+#endif
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_COMBINE_ARB 0x8570
+#define GL_COMBINE_RGB_ARB 0x8571
+#define GL_COMBINE_ALPHA_ARB 0x8572
+#define GL_SOURCE0_RGB_ARB 0x8580
+#define GL_SOURCE1_RGB_ARB 0x8581
+#define GL_SOURCE2_RGB_ARB 0x8582
+#define GL_SOURCE0_ALPHA_ARB 0x8588
+#define GL_SOURCE1_ALPHA_ARB 0x8589
+#define GL_SOURCE2_ALPHA_ARB 0x858A
+#define GL_OPERAND0_RGB_ARB 0x8590
+#define GL_OPERAND1_RGB_ARB 0x8591
+#define GL_OPERAND2_RGB_ARB 0x8592
+#define GL_OPERAND0_ALPHA_ARB 0x8598
+#define GL_OPERAND1_ALPHA_ARB 0x8599
+#define GL_OPERAND2_ALPHA_ARB 0x859A
+#define GL_RGB_SCALE_ARB 0x8573
+#define GL_ADD_SIGNED_ARB 0x8574
+#define GL_INTERPOLATE_ARB 0x8575
+#define GL_SUBTRACT_ARB 0x84E7
+#define GL_CONSTANT_ARB 0x8576
+#define GL_PRIMARY_COLOR_ARB 0x8577
+#define GL_PREVIOUS_ARB 0x8578
+#endif
+
+#ifndef GL_ARB_texture_env_crossbar
+#endif
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_DOT3_RGB_ARB 0x86AE
+#define GL_DOT3_RGBA_ARB 0x86AF
+#endif
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_ARB 0x8370
+#endif
+
+#ifndef GL_ARB_depth_texture
+#define GL_DEPTH_COMPONENT16_ARB 0x81A5
+#define GL_DEPTH_COMPONENT24_ARB 0x81A6
+#define GL_DEPTH_COMPONENT32_ARB 0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A
+#define GL_DEPTH_TEXTURE_...
[truncated message content] |
|
From: <he...@us...> - 2009-03-17 18:03:58
|
Revision: 56
http://simspark.svn.sourceforge.net/simspark/?rev=56&view=rev
Author: hedayat
Date: 2009-03-17 18:03:47 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
ruby 1.9 fix
latest devil fix
many fixes to support windows builds
Modified Paths:
--------------
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/lib/CMakeLists.txt
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/lib/kerosin/imageserver/imageserver.h
trunk/spark/lib/kerosin/kerosin.h
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/lib/oxygen/agentaspect/agentaspect.h
trunk/spark/lib/oxygen/agentaspect/effector.h
trunk/spark/lib/oxygen/agentaspect/perceptor.h
trunk/spark/lib/oxygen/controlaspect/controlaspect.h
trunk/spark/lib/oxygen/gamecontrolserver/behavior.h
trunk/spark/lib/oxygen/gamecontrolserver/gamecontrolserver.h
trunk/spark/lib/oxygen/gamecontrolserver/predicate.h
trunk/spark/lib/oxygen/geometryserver/geometryserver.h
trunk/spark/lib/oxygen/geometryserver/indexbuffer.h
trunk/spark/lib/oxygen/geometryserver/meshimporter.h
trunk/spark/lib/oxygen/geometryserver/stdmeshimporter.h
trunk/spark/lib/oxygen/geometryserver/trimesh.h
trunk/spark/lib/oxygen/monitorserver/custommonitor.h
trunk/spark/lib/oxygen/monitorserver/monitorcmdparser.h
trunk/spark/lib/oxygen/monitorserver/monitorserver.h
trunk/spark/lib/oxygen/monitorserver/monitorsystem.h
trunk/spark/lib/oxygen/oxygen.h
trunk/spark/lib/oxygen/physicsserver/angularmotor.h
trunk/spark/lib/oxygen/physicsserver/balljoint.h
trunk/spark/lib/oxygen/physicsserver/body.h
trunk/spark/lib/oxygen/physicsserver/bodycontroller.h
trunk/spark/lib/oxygen/physicsserver/boxcollider.h
trunk/spark/lib/oxygen/physicsserver/ccylindercollider.h
trunk/spark/lib/oxygen/physicsserver/collider.h
trunk/spark/lib/oxygen/physicsserver/collisionhandler.h
trunk/spark/lib/oxygen/physicsserver/contactjointhandler.h
trunk/spark/lib/oxygen/physicsserver/dragcontroller.h
trunk/spark/lib/oxygen/physicsserver/fixedjoint.h
trunk/spark/lib/oxygen/physicsserver/hinge2joint.h
trunk/spark/lib/oxygen/physicsserver/hingejoint.h
trunk/spark/lib/oxygen/physicsserver/joint.h
trunk/spark/lib/oxygen/physicsserver/odeobject.h
trunk/spark/lib/oxygen/physicsserver/physicsserver.h
trunk/spark/lib/oxygen/physicsserver/planecollider.h
trunk/spark/lib/oxygen/physicsserver/raycollider.h
trunk/spark/lib/oxygen/physicsserver/recorderhandler.h
trunk/spark/lib/oxygen/physicsserver/sliderjoint.h
trunk/spark/lib/oxygen/physicsserver/space.h
trunk/spark/lib/oxygen/physicsserver/spherecollider.h
trunk/spark/lib/oxygen/physicsserver/transformcollider.h
trunk/spark/lib/oxygen/physicsserver/universaljoint.h
trunk/spark/lib/oxygen/physicsserver/velocitycontroller.h
trunk/spark/lib/oxygen/physicsserver/world.h
trunk/spark/lib/salt/CMakeLists.txt
trunk/spark/lib/salt/bounds.h
trunk/spark/lib/salt/defines.h
trunk/spark/lib/salt/fileclasses.h
trunk/spark/lib/salt/frustum.h
trunk/spark/lib/salt/matrix.h
trunk/spark/lib/salt/path.h
trunk/spark/lib/salt/plane.h
trunk/spark/lib/salt/random.h
trunk/spark/lib/salt/rect.h
trunk/spark/lib/salt/sharedlibrary.h
trunk/spark/lib/salt/tvector.h
trunk/spark/lib/salt/vector.h
trunk/spark/lib/zeitgeist/CMakeLists.txt
trunk/spark/lib/zeitgeist/class.h
trunk/spark/lib/zeitgeist/core.h
trunk/spark/lib/zeitgeist/corecontext.h
trunk/spark/lib/zeitgeist/fileserver/fileserver.h
trunk/spark/lib/zeitgeist/fileserver/filesystem.h
trunk/spark/lib/zeitgeist/leaf.h
trunk/spark/lib/zeitgeist/logserver/logserver.h
trunk/spark/lib/zeitgeist/node.h
trunk/spark/lib/zeitgeist/object.h
trunk/spark/lib/zeitgeist/parameterlist.h
trunk/spark/lib/zeitgeist/randomserver/randomserver.h
trunk/spark/lib/zeitgeist/scriptserver/gcvalue.h
trunk/spark/lib/zeitgeist/scriptserver/rubywrapper.cpp
trunk/spark/lib/zeitgeist/scriptserver/scriptserver.h
trunk/spark/lib/zeitgeist/zeitgeist.h
trunk/spark/sparkconfig.h.cmake
trunk/spark/utility/rcssnet/CMakeLists.txt
trunk/spark/utility/rcssnet/addr.hpp
trunk/spark/utility/rcssnet/exception.hpp
trunk/spark/utility/rcssnet/handler.hpp
trunk/spark/utility/rcssnet/socket.hpp
trunk/spark/utility/rcssnet/tcpsocket.hpp
trunk/spark/utility/rcssnet/udpsocket.hpp
Added Paths:
-----------
trunk/spark/lib/kerosin/kerosin_defines.h
trunk/spark/lib/oxygen/oxygen_defines.h
trunk/spark/lib/salt/salt_defines.h
trunk/spark/lib/zeitgeist/zeitgeist_defines.h
trunk/spark/utility/rcssnet/rcssnet3D_defines.h
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/CMakeLists.txt 2009-03-17 18:03:47 UTC (rev 56)
@@ -38,9 +38,6 @@
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
set(ENV{SDLDIR} $ENV{SDLDIR} C:/library/SDL/ "C:/Program Files/SDL/" C:/SDL/)
-if(WIN32)
- set(Boost_USE_STATIC_LIBS ON)
-endif(WIN32)
find_package(Ruby REQUIRED)
find_package(Freetype REQUIRED)
find_package(DevIL REQUIRED)
@@ -88,6 +85,9 @@
endif (RESOLV_LIB_REQ)
endif (NOT FUNC_HSTRERROR_EXISTS)
+if (WIN32)
+ set(NET_LIBS ${NET_LIBS} WS2_32.lib)
+endif (WIN32)
########## add extra flags ##########
if(NOT CMAKE_BUILD_TYPE)
@@ -97,8 +97,10 @@
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR})
if (UNIX)
- set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
+ set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE
STRING "Common C++ compiler flags" FORCE)
+ set(CMAKE_C_FLAGS $ENV{CFLAGS} CACHE
+ STRING "Common C compiler flags" FORCE)
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual" CACHE
STRING "C++ compiler flags for Debug builds" FORCE)
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE
@@ -112,14 +114,18 @@
set(CMAKE_SHARED_MODULE_PREFIX "")
mark_as_advanced(BINDIR LIBDIR DATADIR INCLUDEDIR)
+set(BUILD_SHARED_LIBS TRUE)
+if (BUILD_SHARED_LIBS)
+ set(SHARED_LIB_COMPILE 1)
+endif(BUILD_SHARED_LIBS)
if(WIN32)
- add_definitions(-D_CRT_SECURE_NO_WARNINGS)
- include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
- ${CMAKE_SOURCE_DIR}/windows/include)
- set(BUILD_SHARED_LIBS FALSE)
-else(WIN32)
- set(BUILD_SHARED_LIBS TRUE)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS -DBOOST_ALL_DYN_LINK)
+ include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/windows/include)
+ if(MSVC)
+ add_definitions(/Gm /Zi /GL)
+ endif(MSVC)
endif(WIN32)
########## library version numbers ##########
@@ -190,7 +196,19 @@
set(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION})
set(CPACK_SOURCE_PACKAGE_FILE_NAME
${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION})
+
+set(CPACK_PACKAGE_VENDOR "RoboCup Soccer Server 3D Maintenance Group")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A generic physical simulation system")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "simspark")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README")
+set(CPACK_NSIS_HELP_LINK "TODO:simspark wiki link")
+set(CPACK_NSIS_URL_INFO_ABOUT "http://simspark.sourceforge.net")
+set(CPACK_NSIS_CONTACT "sim...@li...")
+set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "RequestExecutionLevel user")
+
include(CPack)
#original Makefile.am contents follow:
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/ChangeLog 2009-03-17 18:03:47 UTC (rev 56)
@@ -1,3 +1,11 @@
+2009-03-17 Hedayat Vatankhah <he...@gr...>
+
+ * lib/kerosin/imageserver/imageserver.h (ImageServer):
+ - added a fix for the latest DevIL package
+
+ * lib/zeitgeist/scriptserver/rubywrapper.cpp:
+ - improved ruby 1.9 compatibility
+
2009-03-07 Hedayat Vatankhah <he...@gr...>
* test/scenetest/CMakeLists.txt:
Modified: trunk/spark/lib/CMakeLists.txt
===================================================================
--- trunk/spark/lib/CMakeLists.txt 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/CMakeLists.txt 2009-03-17 18:03:47 UTC (rev 56)
@@ -1,18 +1,18 @@
include_directories(${CMAKE_SOURCE_DIR}/utility ${Boost_INCLUDE_DIRS}
${ODE_INCLUDE_DIR})
+link_directories(${Boost_LIBRARY_DIRS})
+
if (USE_COREFOUNDATION)
add_definitions(-DUSE_COREFOUNDATION)
endif (USE_COREFOUNDATION)
-if (APPLE)
- if (USE_COREFOUNDATION)
- set(salt_require_libs /System/Library/Frameworks/CoreFoundation.framework)
- endif (USE_COREFOUNDATION)
- set(zeitgeist_require_libs salt ${salt_require_libs})
- set(oxygen_require_libs zeitgeist ${zeitgeist_require_libs})
- set(kerosin_require_libs oxygen ${oxygen_require_libs})
-endif (APPLE)
+if (USE_COREFOUNDATION)
+ set(salt_require_libs /System/Library/Frameworks/CoreFoundation.framework)
+endif (USE_COREFOUNDATION)
+set(zeitgeist_require_libs salt ${salt_require_libs})
+set(oxygen_require_libs zeitgeist ${zeitgeist_require_libs})
+set(kerosin_require_libs oxygen ${oxygen_require_libs})
add_subdirectory(salt)
add_subdirectory(zeitgeist)
Modified: trunk/spark/lib/kerosin/CMakeLists.txt
===================================================================
--- trunk/spark/lib/kerosin/CMakeLists.txt 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/kerosin/CMakeLists.txt 2009-03-17 18:03:47 UTC (rev 56)
@@ -13,6 +13,7 @@
inputserver/inputitem.h
inputserver/input.h
kerosin.h
+ kerosin_defines.h
materialserver/material.h
materialserver/materialserver.h
sceneserver/axis.h
@@ -116,7 +117,8 @@
renderserver/customrender_c.cpp
)
-include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS}
+ ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
add_library(kerosin ${kerosin_LIB_SRCS} ${kerosin_LIB_HDRS})
Modified: trunk/spark/lib/kerosin/imageserver/imageserver.h
===================================================================
--- trunk/spark/lib/kerosin/imageserver/imageserver.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/kerosin/imageserver/imageserver.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -27,7 +27,10 @@
#endif
#ifdef HAVE_IL_IL_H
#include <IL/il.h>
+#ifndef IL_ILBM
+#define IL_ILBM IL_LBM
#endif
+#endif
#include <zeitgeist/class.h>
@@ -66,7 +69,7 @@
eICO = IL_ICO,
eJPG = IL_JPG,
eJFIF = IL_JFIF,
- eLBM = IL_LBM,
+ eLBM = IL_ILBM,
ePCD = IL_PCD,
ePCX = IL_PCX,
ePIC = IL_PIC,
Modified: trunk/spark/lib/kerosin/kerosin.h
===================================================================
--- trunk/spark/lib/kerosin/kerosin.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/kerosin/kerosin.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -29,6 +29,7 @@
#ifndef KEROSIN_KEROSIN_H
#define KEROSIN_KEROSIN_H
+#include "kerosin_defines.h"
#include "soundserver/soundserver.h"
#include "imageserver/imageserver.h"
#include "fontserver/fontserver.h"
@@ -74,7 +75,7 @@
* registers all internal classes and automatically runs the default init
* script 'sys/script/default.rb' if it exists.
*/
-class Kerosin
+class KEROSIN_API Kerosin
{
//
// types
Added: trunk/spark/lib/kerosin/kerosin_defines.h
===================================================================
--- trunk/spark/lib/kerosin/kerosin_defines.h (rev 0)
+++ trunk/spark/lib/kerosin/kerosin_defines.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -0,0 +1,32 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Copyright (C) 2009 RoboCup Soccer Server 3D Maintenance Group
+ $Id$
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef KEROSIN_KEROSIN_DEFINES_H
+#define KEROSIN_KEROSIN_DEFINES_H
+
+#include <salt/defines.h>
+
+#ifdef kerosin_EXPORTS
+#define KEROSIN_API API_EXPORT
+#else
+#define KEROSIN_API API_IMPORT
+#endif
+
+#endif //KEROSIN_KEROSIN_DEFINES_H
Property changes on: trunk/spark/lib/kerosin/kerosin_defines.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-17 18:03:47 UTC (rev 56)
@@ -13,6 +13,7 @@
gamecontrolserver/actionobject.h
gamecontrolserver/behavior.h
oxygen.h
+ oxygen_defines.h
physicsserver/body.h
physicsserver/bodycontroller.h
physicsserver/boxcollider.h
Modified: trunk/spark/lib/oxygen/agentaspect/agentaspect.h
===================================================================
--- trunk/spark/lib/oxygen/agentaspect/agentaspect.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/agentaspect/agentaspect.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_AGENTASPECT_H
#define OXYGEN_AGENTASPECT_H
+#include <oxygen/oxygen_defines.h>
#include <oxygen/sceneserver/transform.h>
#include <oxygen/gamecontrolserver/actionobject.h>
#include <oxygen/gamecontrolserver/baseparser.h>
@@ -34,7 +35,7 @@
}
#endif
-class AgentAspect : public Transform
+class OXYGEN_API AgentAspect : public Transform
{
public:
AgentAspect();
Modified: trunk/spark/lib/oxygen/agentaspect/effector.h
===================================================================
--- trunk/spark/lib/oxygen/agentaspect/effector.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/agentaspect/effector.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_EFFECTOR_H
#define OXYGEN_EFFECTOR_H
+#include <oxygen/oxygen_defines.h>
#include <oxygen/sceneserver/basenode.h>
#include <oxygen/gamecontrolserver/baseparser.h>
@@ -30,7 +31,7 @@
class ActionObject;
class AgentAspect;
-class Effector : public BaseNode
+class OXYGEN_API Effector : public BaseNode
{
public:
Effector() : BaseNode() {};
Modified: trunk/spark/lib/oxygen/agentaspect/perceptor.h
===================================================================
--- trunk/spark/lib/oxygen/agentaspect/perceptor.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/agentaspect/perceptor.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,13 +22,14 @@
#ifndef OXYGEN_PERCEPTOR_H
#define OXYGEN_PERCEPTOR_H
+#include <oxygen/oxygen_defines.h>
#include <oxygen/sceneserver/basenode.h>
#include <oxygen/gamecontrolserver/baseparser.h>
namespace oxygen
{
-class Perceptor : public oxygen::BaseNode
+class OXYGEN_API Perceptor : public oxygen::BaseNode
{
public:
Modified: trunk/spark/lib/oxygen/controlaspect/controlaspect.h
===================================================================
--- trunk/spark/lib/oxygen/controlaspect/controlaspect.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/controlaspect/controlaspect.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,13 +22,14 @@
#ifndef OXYGEN_CONTROLASPECT_H
#define OXYGEN_CONTROLASPECT_H
+#include <oxygen/oxygen_defines.h>
#include <oxygen/sceneserver/basenode.h>
namespace oxygen
{
class Scene;
-class ControlAspect : public BaseNode
+class OXYGEN_API ControlAspect : public BaseNode
{
public:
ControlAspect();
Modified: trunk/spark/lib/oxygen/gamecontrolserver/behavior.h
===================================================================
--- trunk/spark/lib/oxygen/gamecontrolserver/behavior.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/gamecontrolserver/behavior.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#define OXYGEN_BEHAVIOR_H
#include <string>
+#include <oxygen/oxygen_defines.h>
#include <oxygen/gamecontrolserver/predicate.h>
#include <oxygen/simulationserver/traincontrol.h>
@@ -32,7 +33,7 @@
derivated from this class, and overload 'Init' & 'Think'
to implement its special behavior.
*/
-class Behavior : public zeitgeist::Leaf
+class OXYGEN_API Behavior : public zeitgeist::Leaf
{
public:
/** called once when the initially connected to the server */
Modified: trunk/spark/lib/oxygen/gamecontrolserver/gamecontrolserver.h
===================================================================
--- trunk/spark/lib/oxygen/gamecontrolserver/gamecontrolserver.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/gamecontrolserver/gamecontrolserver.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -24,6 +24,7 @@
#include "actionobject.h"
#include "baseparser.h"
+#include <oxygen/oxygen_defines.h>
#include <zeitgeist/class.h>
#include <zeitgeist/node.h>
@@ -33,7 +34,7 @@
class Effector;
class Scene;
-class GameControlServer : public zeitgeist::Node
+class OXYGEN_API GameControlServer : public zeitgeist::Node
{
public:
Modified: trunk/spark/lib/oxygen/gamecontrolserver/predicate.h
===================================================================
--- trunk/spark/lib/oxygen/gamecontrolserver/predicate.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/gamecontrolserver/predicate.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -28,6 +28,7 @@
#include <boost/any.hpp>
#include <salt/vector.h>
#include <zeitgeist/logserver/logserver.h>
+#include <oxygen/oxygen_defines.h>
namespace oxygen
{
@@ -46,7 +47,7 @@
agent. Again, the Perceptor is independent from the format used to
transmit its data to the agent.
*/
-class Predicate
+class OXYGEN_API Predicate
{
public:
/** \class Iterator encapsulates a
Modified: trunk/spark/lib/oxygen/geometryserver/geometryserver.h
===================================================================
--- trunk/spark/lib/oxygen/geometryserver/geometryserver.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/geometryserver/geometryserver.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_GEOMETRYSERVER_H
#define OXYGEN_GEOMETRYSERVER_H
+#include <oxygen/oxygen_defines.h>
#include <zeitgeist/class.h>
#include <zeitgeist/node.h>
#include "meshexporter.h"
@@ -34,7 +35,7 @@
of plugins to import or generate them. Triangle meshes are used
for collision detection and rendering.
*/
-class GeometryServer : public zeitgeist::Node
+class OXYGEN_API GeometryServer : public zeitgeist::Node
{
protected:
typedef std::map<std::string, boost::shared_ptr<TriMesh> > TMeshMap;
Modified: trunk/spark/lib/oxygen/geometryserver/indexbuffer.h
===================================================================
--- trunk/spark/lib/oxygen/geometryserver/indexbuffer.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/geometryserver/indexbuffer.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_INDEXBUFFER_H
#define OXYGEN_INDEXBUFFER_H
+#include <oxygen/oxygen_defines.h>
#include <boost/shared_array.hpp>
namespace oxygen
@@ -31,7 +32,7 @@
vertexbuffer to describe a set of triangles. It is used together
with the StaticMesh class
*/
-class IndexBuffer
+class OXYGEN_API IndexBuffer
{
public:
IndexBuffer();
Modified: trunk/spark/lib/oxygen/geometryserver/meshimporter.h
===================================================================
--- trunk/spark/lib/oxygen/geometryserver/meshimporter.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/geometryserver/meshimporter.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_MESHIMPORTER_H
#define OXYGEN_MESHIMPORTER_H
+#include <oxygen/oxygen_defines.h>
#include <zeitgeist/class.h>
#include <zeitgeist/node.h>
#include "trimesh.h"
@@ -33,7 +34,7 @@
or generate trimeshes. MeshImporter classes are registered to the
GeometryServer
*/
-class MeshImporter : public zeitgeist::Leaf
+class OXYGEN_API MeshImporter : public zeitgeist::Leaf
{
public:
MeshImporter() : Leaf() {};
Modified: trunk/spark/lib/oxygen/geometryserver/stdmeshimporter.h
===================================================================
--- trunk/spark/lib/oxygen/geometryserver/stdmeshimporter.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/geometryserver/stdmeshimporter.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_STDMESHIMPORTER
#define OXYGEN_STDMESHIMPORTER
+#include <oxygen/oxygen_defines.h>
#include "meshimporter.h"
namespace oxygen
@@ -29,7 +30,7 @@
/** \class StdMeshImporter is a MeshImporter that generates a standard
set of meshes. These are spheres, boxes and capped cylinders.
*/
-class StdMeshImporter : public MeshImporter
+class OXYGEN_API StdMeshImporter : public MeshImporter
{
public:
StdMeshImporter();
@@ -56,7 +57,7 @@
/** constructs a unit capped cylinder */
boost::shared_ptr<TriMesh> UnitCCylinder
(const zeitgeist::ParameterList& parameter);
-
+
/** constructs a flat unit cylinder */
boost::shared_ptr<TriMesh> UnitCylinder();
};
Modified: trunk/spark/lib/oxygen/geometryserver/trimesh.h
===================================================================
--- trunk/spark/lib/oxygen/geometryserver/trimesh.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/geometryserver/trimesh.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -27,6 +27,7 @@
#include <boost/shared_array.hpp>
#include <boost/shared_ptr.hpp>
#include <string>
+#include <oxygen/oxygen_defines.h>
namespace oxygen
{
@@ -41,7 +42,7 @@
vector. Indeces are stored using the IndexBuffer class as as list
of unsigned int values.
*/
-class TriMesh
+class OXYGEN_API TriMesh
{
public:
struct Face
Modified: trunk/spark/lib/oxygen/monitorserver/custommonitor.h
===================================================================
--- trunk/spark/lib/oxygen/monitorserver/custommonitor.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/monitorserver/custommonitor.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -23,12 +23,13 @@
#define OXYGEN_CUSTOMMONITOR_H
#include <zeitgeist/leaf.h>
+#include <oxygen/oxygen_defines.h>
#include <oxygen/gamecontrolserver/predicate.h>
namespace oxygen
{
-class CustomMonitor : public zeitgeist::Leaf
+class OXYGEN_API CustomMonitor : public zeitgeist::Leaf
{
public:
CustomMonitor();
Modified: trunk/spark/lib/oxygen/monitorserver/monitorcmdparser.h
===================================================================
--- trunk/spark/lib/oxygen/monitorserver/monitorcmdparser.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/monitorserver/monitorcmdparser.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -23,12 +23,13 @@
#define OXYGEN_MONITORCMDPARSER_H
#include <zeitgeist/leaf.h>
+#include <oxygen/oxygen_defines.h>
#include <oxygen/gamecontrolserver/predicate.h>
namespace oxygen
{
-class MonitorCmdParser : public zeitgeist::Leaf
+class OXYGEN_API MonitorCmdParser : public zeitgeist::Leaf
{
public:
MonitorCmdParser();
Modified: trunk/spark/lib/oxygen/monitorserver/monitorserver.h
===================================================================
--- trunk/spark/lib/oxygen/monitorserver/monitorserver.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/monitorserver/monitorserver.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_MONITORSERVER_H
#define OXYGEN_MONITORSERVER_H
+#include <oxygen/oxygen_defines.h>
#include <zeitgeist/class.h>
#include <zeitgeist/node.h>
#include "monitorsystem.h"
@@ -29,8 +30,8 @@
namespace oxygen
{
class SimulationServer;
-
-class MonitorServer : public zeitgeist::Node
+
+class OXYGEN_API MonitorServer : public zeitgeist::Node
{
public:
MonitorServer();
@@ -79,7 +80,7 @@
void CollectItemPredicates(bool initial, PredicateList& pList);
virtual void OnLink();
-
+
private:
/** a cached reference to the SimulationServer */
CachedPath<SimulationServer> mSimulationServer;
Modified: trunk/spark/lib/oxygen/monitorserver/monitorsystem.h
===================================================================
--- trunk/spark/lib/oxygen/monitorserver/monitorsystem.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/monitorserver/monitorsystem.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -24,12 +24,13 @@
#include <zeitgeist/class.h>
#include <zeitgeist/node.h>
+#include <oxygen/oxygen_defines.h>
#include <oxygen/gamecontrolserver/predicate.h>
namespace oxygen
{
-class MonitorSystem : public zeitgeist::Node
+class OXYGEN_API MonitorSystem : public zeitgeist::Node
{
public:
MonitorSystem();
Modified: trunk/spark/lib/oxygen/oxygen.h
===================================================================
--- trunk/spark/lib/oxygen/oxygen.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/oxygen.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_OXYGEN_H
#define OXYGEN_OXYGEN_H
+#include "oxygen_defines.h"
#include "agentaspect/agentaspect.h"
#include "agentaspect/effector.h"
#include "agentaspect/perceptor.h"
@@ -101,7 +102,7 @@
/** This is the main class, which initializes the Oxygen framework. It
registers all internal classes.
*/
-class Oxygen
+class OXYGEN_API Oxygen
{
public:
/** initializes the oxygen framework \param zg is a reference to
Added: trunk/spark/lib/oxygen/oxygen_defines.h
===================================================================
--- trunk/spark/lib/oxygen/oxygen_defines.h (rev 0)
+++ trunk/spark/lib/oxygen/oxygen_defines.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -0,0 +1,32 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Copyright (C) 2009 RoboCup Soccer Server 3D Maintenance Group
+ $Id$
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef OXYGEN_OXYGEN_DEFINES_H
+#define OXYGEN_OXYGEN_DEFINES_H
+
+#include <salt/defines.h>
+
+#ifdef oxygen_EXPORTS
+#define OXYGEN_API API_EXPORT
+#else
+#define OXYGEN_API API_IMPORT
+#endif
+
+#endif //OXYGEN_OXYGEN_DEFINES_H
Property changes on: trunk/spark/lib/oxygen/oxygen_defines.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Modified: trunk/spark/lib/oxygen/physicsserver/angularmotor.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/angularmotor.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/angularmotor.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -20,6 +20,7 @@
#ifndef OXYGEN_ANGULARMOTOR_H
#define OXYGEN_ANGULARMOTOR_H
+#include <oxygen/oxygen_defines.h>
#include "joint.h"
namespace oxygen
@@ -31,7 +32,7 @@
up to three axes, allowing torque motors and stops to be set for
rotation about those axes.
*/
-class AngularMotor : public Joint
+class OXYGEN_API AngularMotor : public Joint
{
public:
enum EMotorMode
Modified: trunk/spark/lib/oxygen/physicsserver/balljoint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/balljoint.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/balljoint.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -20,13 +20,14 @@
#ifndef OXYGEN_BALLJOINT_H
#define OXYGEN_BALLJOINT_H
+#include <oxygen/oxygen_defines.h>
#include "joint.h"
namespace oxygen
{
class Body;
-class BallJoint : public Joint
+class OXYGEN_API BallJoint : public Joint
{
public:
BallJoint();
Modified: trunk/spark/lib/oxygen/physicsserver/body.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/body.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/body.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_BODY_H
#define OXYGEN_BODY_H
+#include <oxygen/oxygen_defines.h>
#include "odeobject.h"
namespace oxygen
@@ -35,7 +36,7 @@
usually constant over time: Mass, Center of mass and Inertia
matrix (mass distribution matrix)
*/
-class Body : public ODEObject
+class OXYGEN_API Body : public ODEObject
{
//
// Functions
@@ -319,10 +320,10 @@
protected:
/** the managed ode body */
dBodyID mODEBody;
-
+
/** the total mass translation */
salt::Vector3f mMassTrans;
-
+
/** flag whether mass has been transformed */
bool mMassTransformed;
};
Modified: trunk/spark/lib/oxygen/physicsserver/bodycontroller.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/bodycontroller.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/bodycontroller.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_BODYCONTROLLER_H
#define OXYGEN_BODYCONTROLLER_H
+#include <oxygen/oxygen_defines.h>
#include <oxygen/sceneserver/basenode.h>
namespace oxygen
@@ -31,7 +32,7 @@
/** \class BodyController is a baseclass for nodes that control the
motion of an associated body.
*/
-class BodyController : public BaseNode
+class OXYGEN_API BodyController : public BaseNode
{
public:
BodyController() : BaseNode() {}
Modified: trunk/spark/lib/oxygen/physicsserver/boxcollider.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/boxcollider.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/boxcollider.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_BOXCOLLIDER_H
#define OXYGEN_BOXCOLLIDER_H
+#include <oxygen/oxygen_defines.h>
#include "collider.h"
namespace oxygen
@@ -29,7 +30,7 @@
/** BoxCollider encapsulates an ODE box geometry object.
*/
-class BoxCollider : public Collider
+class OXYGEN_API BoxCollider : public Collider
{
//
// Functions
Modified: trunk/spark/lib/oxygen/physicsserver/ccylindercollider.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/ccylindercollider.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/ccylindercollider.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_CCYLINDERCOLLIDER_H
#define OXYGEN_CCYLINDERCOLLIDER_H
+#include <oxygen/oxygen_defines.h>
#include "collider.h"
namespace oxygen
@@ -32,7 +33,7 @@
half-sphere caps at its ends. This feature makes the internal
collision detection code particularly fast and accurate.
*/
-class CCylinderCollider : public Collider
+class OXYGEN_API CCylinderCollider : public Collider
{
//
// Functions
Modified: trunk/spark/lib/oxygen/physicsserver/collider.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/collider.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/collider.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -25,6 +25,7 @@
#include "odeobject.h"
#include <string>
#include <set>
+#include <oxygen/oxygen_defines.h>
namespace oxygen
{
@@ -41,7 +42,7 @@
bodies. A body and a geom together represent all the properties of
the simulated object.
*/
-class Collider : public ODEObject
+class OXYGEN_API Collider : public ODEObject
{
//
// Functions
Modified: trunk/spark/lib/oxygen/physicsserver/collisionhandler.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/collisionhandler.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/collisionhandler.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -23,6 +23,7 @@
#define OXYGEN_COLLISIONHANDLER_H
#include <oxygen/sceneserver/basenode.h>
+#include <oxygen/oxygen_defines.h>
#include "odewrapper.h"
namespace oxygen
@@ -40,7 +41,7 @@
an ODE contact joint, covering the most common response to a
collision.
*/
-class CollisionHandler : public BaseNode
+class OXYGEN_API CollisionHandler : public BaseNode
{
//
// Functions
Modified: trunk/spark/lib/oxygen/physicsserver/contactjointhandler.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/contactjointhandler.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/contactjointhandler.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_CONTACTJOINTHANDLER_H
#define OXYGEN_CONTACTJOINTHANDLER_H
+#include <oxygen/oxygen_defines.h>
#include "collisionhandler.h"
namespace oxygen
@@ -31,7 +32,7 @@
ODE contact joint between the two bodies associated with the two
affected collision geoms.
*/
-class ContactJointHandler : public CollisionHandler
+class OXYGEN_API ContactJointHandler : public CollisionHandler
{
public:
ContactJointHandler();
Modified: trunk/spark/lib/oxygen/physicsserver/dragcontroller.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/dragcontroller.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/dragcontroller.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -20,6 +20,7 @@
#ifndef OXYGEN_DRAGCONTROLLER_H
#define OXYGEN_DRAGCONTROLLER_H
+#include <oxygen/oxygen_defines.h>
#include <oxygen/physicsserver/bodycontroller.h>
namespace oxygen
@@ -28,7 +29,7 @@
/** \class DragController is a BodyController that applies a linear
and angular drag the controlled body.
*/
-class DragController : public BodyController
+class OXYGEN_API DragController : public BodyController
{
//
// Functions
Modified: trunk/spark/lib/oxygen/physicsserver/fixedjoint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/fixedjoint.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/fixedjoint.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -20,6 +20,7 @@
#ifndef OXYGEN_FIXEDJOINT_H
#define OXYGEN_FIXEDJOINT_H
+#include <oxygen/oxygen_defines.h>
#include "joint.h"
namespace oxygen
@@ -28,14 +29,14 @@
orientation between two bodies, or between a body and the static
environment.
*/
-class FixedJoint : public Joint
+class OXYGEN_API FixedJoint : public Joint
{
public:
FixedJoint();
virtual ~FixedJoint();
- /** Call this on the fixed joint after it has been attached to remember
- the current desired relative offset and desired relative rotation
+ /** Call this on the fixed joint after it has been attached to remember
+ the current desired relative offset and desired relative rotation
between the bodies. */
void SetFixed();
Modified: trunk/spark/lib/oxygen/physicsserver/hinge2joint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/hinge2joint.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/hinge2joint.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -20,13 +20,14 @@
#ifndef OXYGEN_HINGE2JOINT_H
#define OXYGEN_HINGE2JOINT_H
+#include <oxygen/oxygen_defines.h>
#include "joint.h"
namespace oxygen
{
class Body;
-class Hinge2Joint : public Joint
+class OXYGEN_API Hinge2Joint : public Joint
{
public:
Hinge2Joint();
Modified: trunk/spark/lib/oxygen/physicsserver/hingejoint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/hingejoint.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/hingejoint.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -20,13 +20,14 @@
#ifndef OXYGEN_HINGEJOINT_H
#define OXYGEN_HINGEJOINT_H
+#include <oxygen/oxygen_defines.h>
#include "joint.h"
namespace oxygen
{
class Body;
-class HingeJoint : public Joint
+class OXYGEN_API HingeJoint : public Joint
{
public:
HingeJoint();
Modified: trunk/spark/lib/oxygen/physicsserver/joint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/joint.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/joint.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_JOINT_H
#define OXYGEN_JOINT_H
+#include <oxygen/oxygen_defines.h>
#include "odeobject.h"
namespace oxygen
@@ -46,7 +47,7 @@
rates) directly, instead you must set the corresponding body
positions and velocities.
*/
-class Joint : public ODEObject
+class OXYGEN_API Joint : public ODEObject
{
public:
enum EBodyIndex
@@ -136,10 +137,10 @@
salt::Vector3f GetFeedbackTorque(EBodyIndex idx) const;
/** sets the fudgefactor parameter, making this value too small can
- prevent the motor from being able to move the joint away from
- a stop
+ prevent the motor from being able to move the joint away from
+ a stop
*/
- void SetFudgeFactor(EAxisIndex idx, float fudge_factor);
+ void SetFudgeFactor(EAxisIndex idx, float fudge_factor);
/** returns the fudgefactor paramter */
float GetFudgeFactor(EAxisIndex idx) const;
Modified: trunk/spark/lib/oxygen/physicsserver/odeobject.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/odeobject.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/odeobject.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -23,6 +23,7 @@
#ifndef OXYGEN_ODEOBJECT_H
#define OXYGEN_ODEOBJECT_H
+#include <oxygen/oxygen_defines.h>
#include <oxygen/sceneserver/basenode.h>
#include "odewrapper.h"
@@ -33,7 +34,7 @@
/** ODEObject is the base of all classes encapsulating ODE concepts
*/
-class ODEObject : public BaseNode
+class OXYGEN_API ODEObject : public BaseNode
{
public:
//
Modified: trunk/spark/lib/oxygen/physicsserver/physicsserver.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/physicsserver.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/physicsserver.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -24,7 +24,7 @@
#include <zeitgeist/class.h>
#include <zeitgeist/leaf.h>
-//#include <ode/ode.h>
+#include <oxygen/oxygen_defines.h>
#include "odewrapper.h"
namespace oxygen
@@ -32,7 +32,7 @@
class Body;
class Collider;
-class PhysicsServer : public zeitgeist::Leaf
+class OXYGEN_API PhysicsServer : public zeitgeist::Leaf
{
//
// Functions
Modified: trunk/spark/lib/oxygen/physicsserver/planecollider.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/planecollider.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/planecollider.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_PLANECOLLIDER_H
#define OXYGEN_PLANECOLLIDER_H
+#include <oxygen/oxygen_defines.h>
#include "collider.h"
namespace oxygen
@@ -34,7 +35,7 @@
words it is assumed that the plane is always part of the static
environment and not tied to any movable object.
*/
-class PlaneCollider : public Collider
+class OXYGEN_API PlaneCollider : public Collider
{
//
// Functions
Modified: trunk/spark/lib/oxygen/physicsserver/raycollider.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/raycollider.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/raycollider.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_RAYCOLLIDER_H
#define OXYGEN_RAYCOLLIDER_H
+#include <oxygen/oxygen_defines.h>
#include "collider.h"
namespace oxygen
@@ -34,7 +35,7 @@
* from the geom's position and extends in the direction of the geom's
* local Z-axis.
*/
-class RayCollider : public Collider
+class OXYGEN_API RayCollider : public Collider
{
//
// Functions
Modified: trunk/spark/lib/oxygen/physicsserver/recorderhandler.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/recorderhandler.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/recorderhandler.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -25,14 +25,15 @@
#include "collisionhandler.h"
#include "collider.h"
#include <set>
+#include <oxygen/oxygen_defines.h>
namespace oxygen
-{
+{
/** \class RecorderHandler is a CollisionHandler that accumulates
collision information of the Collider it belongs to. It is the
resonsibility of the user to reset the recorder.
*/
-class RecorderHandler : public CollisionHandler
+class OXYGEN_API RecorderHandler : public CollisionHandler
{
public:
typedef std::set<boost::weak_ptr<Collider> > TCollisionSet;
@@ -66,12 +67,12 @@
\param list is the list that receives the parent nodes
*/
void GetParentsSupportingClass(const std::string &name, TParentList &list);
-
+
/** same functionality as GetParentsSupportingClass, but using the
C++ type system instead of string comparisons for improved
performance
- \param CLASS is the template parameter for the name of the class
+ \param CLASS is the template parameter for the name of the class
the parent nodes must support
\param list is the list that receives the parent nodes
Modified: trunk/spark/lib/oxygen/physicsserver/sliderjoint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/sliderjoint.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/sliderjoint.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -20,13 +20,14 @@
#ifndef OXYGEN_SLIDERJOINT_H
#define OXYGEN_SLIDERJOINT_H
+#include <oxygen/oxygen_defines.h>
#include "joint.h"
namespace oxygen
{
class Body;
-class SliderJoint : public Joint
+class OXYGEN_API SliderJoint : public Joint
{
public:
SliderJoint();
Modified: trunk/spark/lib/oxygen/physicsserver/space.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/space.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/space.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -24,6 +24,7 @@
#include "odeobject.h"
#include <set>
+#include <oxygen/oxygen_defines.h>
namespace oxygen
{
@@ -36,7 +37,7 @@
similar to the rigid body concept of the `world', except that it
applies to collision instead of dynamics.
*/
-class Space : public ODEObject
+class OXYGEN_API Space : public ODEObject
{
public:
typedef std::set<dSpaceID> TSpaceIdSet;
Modified: trunk/spark/lib/oxygen/physicsserver/spherecollider.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/spherecollider.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/spherecollider.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_SPHERECOLLIDER_H
#define OXYGEN_SPHERECOLLIDER_H
+#include <oxygen/oxygen_defines.h>
#include "collider.h"
namespace oxygen
@@ -29,7 +30,7 @@
/** SphereCollider encapsulates an ODE sphere geometry object.
*/
-class SphereCollider : public Collider
+class OXYGEN_API SphereCollider : public Collider
{
//
// Functions
Modified: trunk/spark/lib/oxygen/physicsserver/transformcollider.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/transformcollider.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/transformcollider.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_TRANSFORMCOLLIDER_H
#define OXYGEN_TRANSFORMCOLLIDER_H
+#include <oxygen/oxygen_defines.h>
#include "collider.h"
namespace oxygen
@@ -43,7 +44,7 @@
they allow multiple displaced geoms to be connected to one body.
*/
-class TransformCollider : public Collider
+class OXYGEN_API TransformCollider : public Collider
{
//
// Functions
Modified: trunk/spark/lib/oxygen/physicsserver/universaljoint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/universaljoint.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/universaljoint.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -20,13 +20,14 @@
#ifndef OXYGEN_UNIVERSALJOINT_H
#define OXYGEN_UNIVERSALJOINT_H
+#include <oxygen/oxygen_defines.h>
#include "joint.h"
namespace oxygen
{
class Body;
-class UniversalJoint : public Joint
+class OXYGEN_API UniversalJoint : public Joint
{
public:
UniversalJoint();
Modified: trunk/spark/lib/oxygen/physicsserver/velocitycontroller.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/velocitycontroller.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/velocitycontroller.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -20,6 +20,7 @@
#ifndef OXYGEN_VELOCITYCONTROLLER_H
#define OXYGEN_VELOCITYCONTROLLER_H
+#include <oxygen/oxygen_defines.h>
#include <oxygen/physicsserver/bodycontroller.h>
namespace oxygen
@@ -28,7 +29,7 @@
/** \class VelocityController is a BodyController that restricts the
maximum velocity a body can attain
*/
-class VelocityController : public BodyController
+class OXYGEN_API VelocityController : public BodyController
{
//
// Functions
Modified: trunk/spark/lib/oxygen/physicsserver/world.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/world.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/oxygen/physicsserver/world.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_WORLD_H
#define OXYGEN_WORLD_H
+#include <oxygen/oxygen_defines.h>
#include "odeobject.h"
namespace oxygen
@@ -34,7 +35,7 @@
time, thus one reason to use separate worlds is to simulate
systems at different rates.
*/
-class World : public ODEObject
+class OXYGEN_API World : public ODEObject
{
//
// Functions
Modified: trunk/spark/lib/salt/CMakeLists.txt
===================================================================
--- trunk/spark/lib/salt/CMakeLists.txt 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/salt/CMakeLists.txt 2009-03-17 18:03:47 UTC (rev 56)
@@ -14,6 +14,7 @@
rect.h
sharedlibrary.h
vector.h
+ salt_defines.h
)
set(salt_LIB_SRCS
Modified: trunk/spark/lib/salt/bounds.h
===================================================================
--- trunk/spark/lib/salt/bounds.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/salt/bounds.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,7 +22,7 @@
#ifndef SALT_BOUNDS_H
#define SALT_BOUNDS_H
-#include "defines.h"
+#include "salt_defines.h"
#include "matrix.h"
#include "vector.h"
@@ -32,7 +32,7 @@
{
/** AABB3 provides an axis aligned three dimensional bounding box */
-class AABB3
+class SALT_API AABB3
{
public:
// constructors
@@ -142,7 +142,7 @@
};
/** AABB2 provides an axis aligned two dimensional bounding box */
-class AABB2
+class SALT_API AABB2
{
public:
// constructors
@@ -234,7 +234,7 @@
/** BoundingSphere provides a three dimensional sphere */
-class BoundingSphere
+class SALT_API BoundingSphere
{
public:
// constructors
Modified: trunk/spark/lib/salt/defines.h
===================================================================
--- trunk/spark/lib/salt/defines.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/salt/defines.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -36,27 +36,32 @@
#if defined(_MSC_VER)
// here we turn of a couple of pesky warnings VC emmits
- #pragma warning (disable : 4786) // truncation of debug information
+ #pragma warning (disable : 4786) // truncation of debug information
+ #pragma warning (disable : 4251) // don't complain about missing dll interfaces
#endif
// some compiler-specific defines
#if defined(_MSC_VER)
- // shared library export stuff
+ // shared library export/import stuff
#define SHARED_LIB_EXPORT __declspec(dllexport)
+ #define SHARED_LIB_IMPORT __declspec(dllimport)
// other symbols
#define f_inline __forceinline
// hide the attribute definitions from MSVC
#define __attribute__(x) /*NOTHING*/
#elif defined(__GNUC__)
#define SHARED_LIB_EXPORT
+ #define SHARED_LIB_IMPORT
#define f_inline inline
#endif
// this macro only exports the class in a header, if the shared library version is compiled
#ifdef SHARED_LIB_COMPILE
- #define CLASS_EXPORT SHARED_LIB_EXPORT
+ #define API_EXPORT SHARED_LIB_EXPORT
+ #define API_IMPORT SHARED_LIB_IMPORT
#else
- #define CLASS_EXPORT
+ #define API_EXPORT
+ #define API_IMPORT
#endif
#define Assert(expression, desc) assert(expression && desc)
Modified: trunk/spark/lib/salt/fileclasses.h
===================================================================
--- trunk/spark/lib/salt/fileclasses.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/salt/fileclasses.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -34,6 +34,7 @@
#include <cstdio>
#include <cstdlib>
#include <string>
+#include "salt_defines.h"
#ifndef PATH_MAX
#define PATH_MAX 4096
@@ -45,7 +46,7 @@
/** RFile defines an interface and some basic support functions for
* classes providing read only file services
*/
-class RFile
+class SALT_API RFile
{
public:
virtual ~RFile() {};
@@ -178,7 +179,7 @@
* buffer. On open() a file is completely read into the buffer and
* from there on served from memory.
*/
-class MemFile : public RFile
+class SALT_API MemFile : public RFile
{
public:
MemFile(const char*fn=NULL, const char*mode="rb");
@@ -223,7 +224,7 @@
/** WFile extends the RFile interface with methods for writing to a
* file and related support funtions
*/
-class WFile : public RFile
+class SALT_API WFile : public RFile
{
public:
virtual ~WFile() {};
@@ -306,7 +307,7 @@
};
/** StdFile implements the WFile interface using the standard file system */
-class StdFile : public WFile
+class SALT_API StdFile : public WFile
{
public:
StdFile(FILE*f);
Modified: trunk/spark/lib/salt/frustum.h
===================================================================
--- trunk/spark/lib/salt/frustum.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/salt/frustum.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -36,7 +36,7 @@
#ifndef SALT_FRUSTUM_H
#define SALT_FRUSTUM_H
-#include "defines.h"
+#include "salt_defines.h"
#include "plane.h"
#include "bounds.h"
@@ -47,7 +47,7 @@
* space (possibly infinite) defined by a set of planes. This class
* also provides some 'special' frustra construction methods.
*/
-class Frustum
+class SALT_API Frustum
{
// Members
public:
Modified: trunk/spark/lib/salt/matrix.h
===================================================================
--- trunk/spark/lib/salt/matrix.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/salt/matrix.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,7 +22,7 @@
#ifndef SALT_MATRIX_H
#define SALT_MATRIX_H
-#include "defines.h"
+#include "salt_defines.h"
#include "vector.h"
#include <memory.h>
@@ -35,7 +35,7 @@
/** Matrix provides a 4x4 float Matrix along with methods to set
* up and manipulate it.
*/
-class Matrix
+class SALT_API Matrix
{
public:
/** the values of the matrix */
Modified: trunk/spark/lib/salt/path.h
===================================================================
--- trunk/spark/lib/salt/path.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/salt/path.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -44,6 +44,7 @@
#include <sparkconfig.h>
#endif
+#include "salt_defines.h"
#include <string>
#include <list>
@@ -54,7 +55,7 @@
* hierarchy. It is capable of cleaning paths and separating a path
* into path components.
*/
-class Path
+class SALT_API Path
{
//
// types
Modified: trunk/spark/lib/salt/plane.h
===================================================================
--- trunk/spark/lib/salt/plane.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/salt/plane.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -32,7 +32,7 @@
#ifndef SALT_PLANE_H
#define SALT_PLANE_H
-#include "defines.h"
+#include "salt_defines.h"
#include "vector.h"
#include "bounds.h"
@@ -68,7 +68,7 @@
* vector formed by the coefficients <A,B,C> is the normal vector to
* the plane.
*/
-class Plane
+class SALT_API Plane
{
// Members
public:
Modified: trunk/spark/lib/salt/random.h
===================================================================
--- trunk/spark/lib/salt/random.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/salt/random.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -24,6 +24,7 @@
#include <boost/random.hpp>
#include <boost/version.hpp>
+#include "salt_defines.h"
namespace salt
{
Modified: trunk/spark/lib/salt/rect.h
===================================================================
--- trunk/spark/lib/salt/rect.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/salt/rect.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -22,13 +22,13 @@
#ifndef SALT_RECT_H
#define SALT_RECT_H
-#include "defines.h"
+#include "salt_defines.h"
namespace salt
{
/** this class provides rectangle in two dimensional space */
-class Rect
+class SALT_API Rect
{
public:
/** constucts undefined Rect for performance reasons */
Added: trunk/spark/lib/salt/salt_defines.h
===================================================================
--- trunk/spark/lib/salt/salt_defines.h (rev 0)
+++ trunk/spark/lib/salt/salt_defines.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -0,0 +1,32 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Copyright (C) 2009 RoboCup Soccer Server 3D Maintenance Group
+ $Id$
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef SALT_SALT_DEFINES_H
+#define SALT_SALT_DEFINES_H
+
+#include "defines.h"
+
+#ifdef salt_EXPORTS
+#define SALT_API API_EXPORT
+#else
+#define SALT_API API_IMPORT
+#endif
+
+#endif //SALT_SALT_DEFINES_H
Property changes on: trunk/spark/lib/salt/salt_defines.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Modified: trunk/spark/lib/salt/sharedlibrary.h
===================================================================
--- trunk/spark/lib/salt/sharedlibrary.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/salt/sharedlibrary.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -29,7 +29,7 @@
#ifndef SALT_SHAREDLIBRARY_H
#define SALT_SHAREDLIBRARY_H
-#include "defines.h"
+#include "salt_defines.h"
#include <string>
#include <cstdio>
@@ -42,7 +42,7 @@
* Windows using the Visual C++ Compiler and Linux using the gcc
* compiler are available.
*/
-class SharedLibrary
+class SALT_API SharedLibrary
{
//
// types
Modified: trunk/spark/lib/salt/tvector.h
===================================================================
--- trunk/spark/lib/salt/tvector.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/salt/tvector.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -33,7 +33,7 @@
#ifndef SALT_TVECTOR_H
#define SALT_TVECTOR_H
-#include "defines.h"
+#include "salt_defines.h"
#include "gmath.h"
#include <iostream>
Modified: trunk/spark/lib/salt/vector.h
===================================================================
--- trunk/spark/lib/salt/vector.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/salt/vector.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -37,7 +37,7 @@
namespace salt
{
-class Vector2f : public TVector2<float, Vector2f>
+class SALT_API Vector2f : public TVector2<float, Vector2f>
{
//
// Methods
@@ -74,7 +74,7 @@
}
};
-class Vector3f : public TVector3<float, Vector3f>
+class SALT_API Vector3f : public TVector3<float, Vector3f>
{
//
// Methods
Modified: trunk/spark/lib/zeitgeist/CMakeLists.txt
===================================================================
--- trunk/spark/lib/zeitgeist/CMakeLists.txt 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/zeitgeist/CMakeLists.txt 2009-03-17 18:03:47 UTC (rev 56)
@@ -9,6 +9,7 @@
object.h
object_c.h
zeitgeist.h
+ zeitgeist_defines.h
fileserver/fileserver.h
fileserver/filesystem.h
logserver/logserver.h
Modified: trunk/spark/lib/zeitgeist/class.h
===================================================================
--- trunk/spark/lib/zeitgeist/class.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/zeitgeist/class.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -127,7 +127,7 @@
* through a unified interface, therefore enabling Class objects to be
* added at runtime to the Core.
*/
-class Class : public Leaf
+class ZEITGEIST_API Class : public Leaf
{
// friends
friend class Object;
Modified: trunk/spark/lib/zeitgeist/core.h
===================================================================
--- trunk/spark/lib/zeitgeist/core.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/zeitgeist/core.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -28,6 +28,7 @@
#include <set>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
+#include "zeitgeist_defines.h"
namespace salt
{
@@ -53,7 +54,7 @@
bundles- plugins containg new classes, that can be registered to
the framework at runtime.
*/
-class Core
+class ZEITGEIST_API Core
{
public:
//
Modified: trunk/spark/lib/zeitgeist/corecontext.h
===================================================================
--- trunk/spark/lib/zeitgeist/corecontext.h 2009-03-07 11:38:32 UTC (rev 55)
+++ trunk/spark/lib/zeitgeist/corecontext.h 2009-03-17 18:03:47 UTC (rev 56)
@@ -34,6 +34,7 @@
#include <list>
#include <boost/weak_ptr.hpp>
#include <boost/shared_ptr.hpp>
+#include "zeitgeist_defines.h"
namespace zeitgeist
{
@@ -51,7 +52,7 @@
* browsing the same object hierarchy. Therefore it was necessary to
* place the current browsing context into a distinct object.
*/
-class CoreContext
+class ZEITGEIST_API CoreContext
{
//
// types
Modified: trunk/spark/lib/zeitgeist/fileserver/fileserver.h
===================================================================
---...
[truncated message content] |
|
From: <he...@us...> - 2009-03-07 11:38:42
|
Revision: 55
http://simspark.svn.sourceforge.net/simspark/?rev=55&view=rev
Author: hedayat
Date: 2009-03-07 11:38:32 +0000 (Sat, 07 Mar 2009)
Log Message:
-----------
ZLIB fix for Linux
respect SDLDIR environment variable
Modified Paths:
--------------
trunk/spark/CMakeLists.txt
trunk/spark/cmake/FindZLIB.cmake
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-03-07 08:14:16 UTC (rev 54)
+++ trunk/spark/CMakeLists.txt 2009-03-07 11:38:32 UTC (rev 55)
@@ -36,7 +36,7 @@
endif (NOT USE_COREFOUNDATION STREQUAL "OFF")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
-set(ENV{SDLDIR} C:/library/SDL/ "C:/Program Files/SDL/" C:/SDL/)
+set(ENV{SDLDIR} $ENV{SDLDIR} C:/library/SDL/ "C:/Program Files/SDL/" C:/SDL/)
if(WIN32)
set(Boost_USE_STATIC_LIBS ON)
Modified: trunk/spark/cmake/FindZLIB.cmake
===================================================================
--- trunk/spark/cmake/FindZLIB.cmake 2009-03-07 08:14:16 UTC (rev 54)
+++ trunk/spark/cmake/FindZLIB.cmake 2009-03-07 11:38:32 UTC (rev 55)
@@ -1,37 +1,42 @@
-# - Find zlib
-# Find the native ZLIB includes and library
-#
-# ZLIB_INCLUDE_DIR - where to find zlib.h, etc.
-# ZLIB_LIBRARIES - List of libraries when using zlib.
-# ZLIB_FOUND - True if zlib found.
-
-
-IF (ZLIB_INCLUDE_DIR)
- # Already in cache, be silent
- SET(ZLIB_FIND_QUIETLY TRUE)
-ENDIF (ZLIB_INCLUDE_DIR)
-
-FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
- C:/library/zlib123
- C:/zlib123
- "C:/Program Files/zlib123"
-)
-
-FIND_LIBRARY(ZLIB_LIBRARY zlib1.lib
- C:/library/zlib123/projects/visualc6/Win32_DLL_Release
- C:/zlib123/projects/visualc6/Win32_DLL_Release
- "C:/Program Files/zlib123/projects/visualc6/Win32_DLL_Release"
-)
-
-# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
-
-IF(ZLIB_FOUND)
- SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
-ELSE(ZLIB_FOUND)
- SET( ZLIB_LIBRARIES )
-ENDIF(ZLIB_FOUND)
-
-MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
+# - Find zlib
+# Find the native ZLIB includes and library
+#
+# ZLIB_INCLUDE_DIR - where to find zlib.h, etc.
+# ZLIB_LIBRARIES - List of libraries when using zlib.
+# ZLIB_FOUND - True if zlib found.
+
+
+IF (ZLIB_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(ZLIB_FIND_QUIETLY TRUE)
+ENDIF (ZLIB_INCLUDE_DIR)
+
+FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+ $ENV{ZLIB_DIR}
+ C:/library/
+ C:/
+ "C:/Program Files/"
+ PATH_SUFFIXES zlib123
+)
+
+SET(ZLIB_NAMES z zlib zdll zlib1)
+FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES}
+ $ENV{ZLIB_DIR}
+ C:/library/zlib123/
+ C:/zlib123/
+ "C:/Program Files/zlib123/"
+ PATH_SUFFIXES projects/visualc6/Win32_DLL_Release
+)
+
+# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+
+IF(ZLIB_FOUND)
+ SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
+ELSE(ZLIB_FOUND)
+ SET( ZLIB_LIBRARIES )
+ENDIF(ZLIB_FOUND)
+
+MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-03-07 08:14:42
|
Revision: 54
http://simspark.svn.sourceforge.net/simspark/?rev=54&view=rev
Author: hedayat
Date: 2009-03-07 08:14:16 +0000 (Sat, 07 Mar 2009)
Log Message:
-----------
Improve Windows support: now you can build simspark in Windows, and create installers on it :)
Modified Paths:
--------------
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/cmake/FindODE.cmake
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/lib/salt/CMakeLists.txt
trunk/spark/lib/zeitgeist/CMakeLists.txt
trunk/spark/plugin/CMakeLists.txt
trunk/spark/plugin/filesystemzip/CMakeLists.txt
trunk/spark/plugin/imageperceptor/CMakeLists.txt
trunk/spark/spark/CMakeLists.txt
trunk/spark/test/CMakeLists.txt
trunk/spark/test/scenetest/CMakeLists.txt
trunk/spark/utility/rcssnet/CMakeLists.txt
trunk/spark/utility/tinyxml/CMakeLists.txt
Removed Paths:
-------------
trunk/spark/cmake/FindSDL.cmake
trunk/spark/windows/sparkconfig.h
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/CMakeLists.txt 2009-03-07 08:14:16 UTC (rev 54)
@@ -36,8 +36,9 @@
endif (NOT USE_COREFOUNDATION STREQUAL "OFF")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
+set(ENV{SDLDIR} C:/library/SDL/ "C:/Program Files/SDL/" C:/SDL/)
+
if(WIN32)
- find_package(zlib REQUIRED)
set(Boost_USE_STATIC_LIBS ON)
endif(WIN32)
find_package(Ruby REQUIRED)
@@ -49,6 +50,7 @@
find_package(OpenGL REQUIRED)
find_package(SDL REQUIRED)
find_package(FMOD)
+find_package(ZLIB)
set(HAVE_IL_IL_H 1)
set(HAVE_KEROSIN_KEROSIN_H 1)
@@ -115,6 +117,9 @@
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/windows/include)
+ set(BUILD_SHARED_LIBS FALSE)
+else(WIN32)
+ set(BUILD_SHARED_LIBS TRUE)
endif(WIN32)
########## library version numbers ##########
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/ChangeLog 2009-03-07 08:14:16 UTC (rev 54)
@@ -1,3 +1,29 @@
+2009-03-07 Hedayat Vatankhah <he...@gr...>
+
+ * test/scenetest/CMakeLists.txt:
+ - exclude from build in Windows
+
+ * test/CMakeLists.txt:
+ * plugin/CMakeLists.txt:
+ - fixed for Windows compatibility
+ - add Boost library dir to link directories
+
+ * cmake/FindODE.cmake:
+ - add search paths for latest ode release (ode-0.11)
+
+ * plugin/filesystemzip/CMakeLists.txt:
+ - build only if zlib is available
+
+ * spark/CMakeLists.txt:
+ * lib/zeitgeist/CMakeLists.txt:
+ * lib/salt/CMakeLists.txt:
+ * lib/oxygen/CMakeLists.txt:
+ * lib/kerosin/CMakeLists.txt:
+ * utility/tinyxml/CMakeLists.txt:
+ * utility/rcssnet/CMakeLists.txt:
+ * CMakeLists.txt:
+ - Do not build shared libraries on windows for now
+
2009-02-17 Marian Buchta <mar...@gm...>
* CMakeLists.txt
Modified: trunk/spark/cmake/FindODE.cmake
===================================================================
--- trunk/spark/cmake/FindODE.cmake 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/cmake/FindODE.cmake 2009-03-07 08:14:16 UTC (rev 54)
@@ -17,15 +17,19 @@
C:/ode/include
)
FIND_LIBRARY(ODE_LIBRARY
- NAMES ode
+ NAMES ode ode_double ode_single
PATHS
/usr/lib
/usr/lib64
/usr/local/lib
$ENV{OGRE_HOME}/lib # OGRE SDK on WIN32
- C:/library/ode/lib/releaselib
- "C:/Program Files/ode/lib/releaselib"
- C:/ode/lib/releaselib
+ C:/library/ode/lib/
+ "C:/Program Files/ode/lib/"
+ C:/ode/lib/
+ PATH_SUFFIXES
+ releaselib
+ ReleaseDoubleDLL ReleaseDoubleLib
+ ReleaseSingleDLL ReleaseSingleLib
)
IF(ODE_INCLUDE_DIR)
Deleted: trunk/spark/cmake/FindSDL.cmake
===================================================================
--- trunk/spark/cmake/FindSDL.cmake 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/cmake/FindSDL.cmake 2009-03-07 08:14:16 UTC (rev 54)
@@ -1,185 +0,0 @@
-# Locate SDL library
-# This module defines
-# SDL_LIBRARY, the name of the library to link against
-# SDL_FOUND, if false, do not try to link to SDL
-# SDL_INCLUDE_DIR, where to find SDL.h
-#
-# This module responds to the the flag:
-# SDL_BUILDING_LIBRARY
-# If this is defined, then no SDL_main will be linked in because
-# only applications need main().
-# Otherwise, it is assumed you are building an application and this
-# module will attempt to locate and set the the proper link flags
-# as part of the returned SDL_LIBRARY variable.
-#
-# Don't forget to include SDLmain.h and SDLmain.m your project for the
-# OS X framework based version. (Other versions link to -lSDLmain which
-# this module will try to find on your behalf.) Also for OS X, this
-# module will automatically add the -framework Cocoa on your behalf.
-#
-#
-# Additional Note: If you see an empty SDL_LIBRARY_TEMP in your configuration
-# and no SDL_LIBRARY, it means CMake did not find your SDL library
-# (SDL.dll, libsdl.so, SDL.framework, etc).
-# Set SDL_LIBRARY_TEMP to point to your SDL library, and configure again.
-# Similarly, if you see an empty SDLMAIN_LIBRARY, you should set this value
-# as appropriate. These values are used to generate the final SDL_LIBRARY
-# variable, but when these values are unset, SDL_LIBRARY does not get created.
-#
-#
-# $SDLDIR is an environment variable that would
-# correspond to the ./configure --prefix=$SDLDIR
-# used in building SDL.
-# l.e.galup 9-20-02
-#
-# Modified by Eric Wing.
-# Added code to assist with automated building by using environmental variables
-# and providing a more controlled/consistent search behavior.
-# Added new modifications to recognize OS X frameworks and
-# additional Unix paths (FreeBSD, etc).
-# Also corrected the header search path to follow "proper" SDL guidelines.
-# Added a search for SDLmain which is needed by some platforms.
-# Added a search for threads which is needed by some platforms.
-# Added needed compile switches for MinGW.
-#
-# On OSX, this will prefer the Framework version (if found) over others.
-# People will have to manually change the cache values of
-# SDL_LIBRARY to override this selection or set the CMake environment
-# CMAKE_INCLUDE_PATH to modify the search paths.
-#
-# Note that the header path has changed from SDL/SDL.h to just SDL.h
-# This needed to change because "proper" SDL convention
-# is #include "SDL.h", not <SDL/SDL.h>. This is done for portability
-# reasons because not all systems place things in SDL/ (see FreeBSD).
-
-FIND_PATH(SDL_INCLUDE_DIR SDL.h
- HINTS
- $ENV{SDLDIR}
- PATH_SUFFIXES include
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local/include/SDL
- /usr/include/SDL
- /usr/local/include/SDL12
- /usr/local/include/SDL11 # FreeBSD ports
- /usr/include/SDL12
- /usr/include/SDL11
- /usr/local/include
- /usr/include
- /sw/include/SDL # Fink
- /sw/include
- /opt/local/include/SDL # DarwinPorts
- /opt/local/include
- /opt/csw/include/SDL # Blastwave
- /opt/csw/include
- /opt/include/SDL
- /opt/include
- C:/library/SDL/include
- "C:/Program Files/SDL/include"
- C:/SDL/include
-)
-#MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}")
-
-# SDL-1.1 is the name used by FreeBSD ports...
-# don't confuse it for the version number.
-FIND_LIBRARY(SDL_LIBRARY_TEMP
- NAMES SDL SDL-1.1
- HINTS
- $ENV{SDLDIR}
- PATH_SUFFIXES lib64 lib
- PATHS
- /usr/local
- /usr
- /sw
- /opt/local
- /opt/csw
- /opt
- C:/library/SDL/lib
- "C:/Program Files/SDL/lib"
- C:/SDL/lib
-)
-
-#MESSAGE("SDL_LIBRARY_TEMP is ${SDL_LIBRARY_TEMP}")
-
-IF(NOT SDL_BUILDING_LIBRARY)
- IF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
- # Non-OS X framework versions expect you to also dynamically link to
- # SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms
- # seem to provide SDLmain for compatibility even though they don't
- # necessarily need it.
- FIND_LIBRARY(SDLMAIN_LIBRARY
- NAMES SDLmain SDLmain-1.1
- HINTS
- $ENV{SDLDIR}
- PATH_SUFFIXES lib64 lib
- PATHS
- /usr/local
- /usr
- /sw
- /opt/local
- /opt/csw
- /opt
- C:/library/SDL/lib
- "C:/Program Files/SDL/lib"
- C:/SDL/lib
- )
- ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
-ENDIF(NOT SDL_BUILDING_LIBRARY)
-
-# SDL may require threads on your system.
-# The Apple build may not need an explicit flag because one of the
-# frameworks may already provide it.
-# But for non-OSX systems, I will use the CMake Threads package.
-IF(NOT APPLE)
- FIND_PACKAGE(Threads)
-ENDIF(NOT APPLE)
-
-# MinGW needs an additional library, mwindows
-# It's total link flags should look like -lmingw32 -lSDLmain -lSDL -lmwindows
-# (Actually on second look, I think it only needs one of the m* libraries.)
-IF(MINGW)
- SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
-ENDIF(MINGW)
-
-SET(SDL_FOUND "NO")
-IF(SDL_LIBRARY_TEMP)
- # For SDLmain
- IF(NOT SDL_BUILDING_LIBRARY)
- IF(SDLMAIN_LIBRARY)
- SET(SDL_LIBRARY_TEMP ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
- ENDIF(SDLMAIN_LIBRARY)
- ENDIF(NOT SDL_BUILDING_LIBRARY)
-
- # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.
- # CMake doesn't display the -framework Cocoa string in the UI even
- # though it actually is there if I modify a pre-used variable.
- # I think it has something to do with the CACHE STRING.
- # So I use a temporary variable until the end so I can set the
- # "real" variable in one-shot.
- IF(APPLE)
- SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} "-framework Cocoa")
- ENDIF(APPLE)
-
- # For threads, as mentioned Apple doesn't need this.
- # In fact, there seems to be a problem if I used the Threads package
- # and try using this line, so I'm just skipping it entirely for OS X.
- IF(NOT APPLE)
- SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
- ENDIF(NOT APPLE)
-
- # For MinGW library
- IF(MINGW)
- SET(SDL_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL_LIBRARY_TEMP})
- ENDIF(MINGW)
-
- # Set the final string here so the GUI reflects the final state.
- SET(SDL_LIBRARY ${SDL_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found")
- # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
- SET(SDL_LIBRARY_TEMP "${SDL_LIBRARY_TEMP}" CACHE INTERNAL "")
-
- SET(SDL_FOUND "YES")
-ENDIF(SDL_LIBRARY_TEMP)
-
-#MESSAGE("SDL_LIBRARY is ${SDL_LIBRARY}")
-
Modified: trunk/spark/lib/kerosin/CMakeLists.txt
===================================================================
--- trunk/spark/lib/kerosin/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/lib/kerosin/CMakeLists.txt 2009-03-07 08:14:16 UTC (rev 54)
@@ -118,7 +118,7 @@
include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
-add_library(kerosin SHARED ${kerosin_LIB_SRCS} ${kerosin_LIB_HDRS})
+add_library(kerosin ${kerosin_LIB_SRCS} ${kerosin_LIB_HDRS})
target_link_libraries(kerosin ${FREETYPE_LIBRARIES} ${DevIL_LIBRARIES}
${SDL_LIBRARY} ${OPENGL_LIBRARIES} ${kerosin_require_libs})
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-07 08:14:16 UTC (rev 54)
@@ -219,7 +219,7 @@
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility/)
-add_library(oxygen SHARED ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
+add_library(oxygen ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES}
${ODE_LIBRARY} ${oxygen_require_libs})
Modified: trunk/spark/lib/salt/CMakeLists.txt
===================================================================
--- trunk/spark/lib/salt/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/lib/salt/CMakeLists.txt 2009-03-07 08:14:16 UTC (rev 54)
@@ -26,7 +26,7 @@
sharedlibrary.cpp
)
-add_library(salt SHARED ${salt_LIB_SRCS} ${salt_LIB_HDRS})
+add_library(salt ${salt_LIB_SRCS} ${salt_LIB_HDRS})
target_link_libraries(salt libobject ${salt_require_libs})
Modified: trunk/spark/lib/zeitgeist/CMakeLists.txt
===================================================================
--- trunk/spark/lib/zeitgeist/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/lib/zeitgeist/CMakeLists.txt 2009-03-07 08:14:16 UTC (rev 54)
@@ -56,7 +56,7 @@
include_directories(${CMAKE_SOURCE_DIR}/lib ${RUBY_INCLUDE_PATH})
-add_library(zeitgeist SHARED ${zeitgeist_LIB_SRCS} ${zeitgeist_LIB_HDRS})
+add_library(zeitgeist ${zeitgeist_LIB_SRCS} ${zeitgeist_LIB_HDRS})
target_link_libraries(zeitgeist ${RUBY_LIBRARY} ${zeitgeist_require_libs})
Modified: trunk/spark/plugin/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/plugin/CMakeLists.txt 2009-03-07 08:14:16 UTC (rev 54)
@@ -1,13 +1,11 @@
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
- ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+ ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+link_directories(${Boost_LIBRARY_DIRS})
-if (APPLE)
- if (USE_COREFOUNDATION)
- set(spark_libs kerosin oxygen zeitgeist salt /System/Library/Frameworks/CoreFoundation.framework)
- else (USE_COREFOUNDATION)
- set(spark_libs kerosin oxygen zeitgeist salt)
- endif (USE_COREFOUNDATION)
-endif (APPLE)
+set(spark_libs kerosin oxygen zeitgeist salt)
+if (APPLE AND USE_COREFOUNDATION)
+ set(spark_libs ${spark_libs} /System/Library/Frameworks/CoreFoundation.framework)
+endif (APPLE AND USE_COREFOUNDATION)
add_subdirectory(filesystemstd)
add_subdirectory(filesystemzip)
Modified: trunk/spark/plugin/filesystemzip/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-03-07 08:14:16 UTC (rev 54)
@@ -8,15 +8,14 @@
filesystemzip_c.cpp
)
-if (Boost_REGEX_FOUND)
+if (Boost_REGEX_FOUND AND ZLIB_FOUND)
add_library(filesystemzip MODULE ${filesystemzip_LIB_SRCS})
- if(WIN32)
- include_directories(${ZLIB_INCLUDE_DIR})
- endif(WIN32)
+ include_directories(${ZLIB_INCLUDE_DIR})
- target_link_libraries(filesystemzip ${Boost_REGEX_LIBRARY} ${spark_libs} z)
+ target_link_libraries(filesystemzip ${Boost_REGEX_LIBRARY}
+ ${spark_libs} ${ZLIB_LIBRARIES})
set_target_properties(filesystemzip PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS filesystemzip DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
-endif (Boost_REGEX_FOUND)
+endif (Boost_REGEX_FOUND AND ZLIB_FOUND)
Modified: trunk/spark/plugin/imageperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-03-07 08:14:16 UTC (rev 54)
@@ -10,7 +10,7 @@
add_library(imageperceptor MODULE ${imageperceptor_LIB_SRCS})
-target_link_libraries(imageperceptor ${spark_libs})
+target_link_libraries(imageperceptor ${spark_libs} ${Boost_LIBRARIES})
set_target_properties(imageperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
if (NOT APPLE)
Modified: trunk/spark/spark/CMakeLists.txt
===================================================================
--- trunk/spark/spark/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/spark/CMakeLists.txt 2009-03-07 08:14:16 UTC (rev 54)
@@ -8,7 +8,7 @@
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${DevIL_INCLUDE_DIR})
-add_library(spark SHARED ${spark_LIB_SRCS})
+add_library(spark ${spark_LIB_SRCS})
target_link_libraries(spark salt zeitgeist oxygen kerosin)
Modified: trunk/spark/test/CMakeLists.txt
===================================================================
--- trunk/spark/test/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/test/CMakeLists.txt 2009-03-07 08:14:16 UTC (rev 54)
@@ -1,6 +1,8 @@
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
+link_directories(${Boost_LIBRARY_DIRS})
+
add_subdirectory(coretest)
add_subdirectory(fonttest)
add_subdirectory(inputtest)
Modified: trunk/spark/test/scenetest/CMakeLists.txt
===================================================================
--- trunk/spark/test/scenetest/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/test/scenetest/CMakeLists.txt 2009-03-07 08:14:16 UTC (rev 54)
@@ -11,11 +11,12 @@
include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
${DevIL_INCLUDE_DIR})
-add_executable(scenetest ${scenetest_SRCS})
+if (NOT WIN32)
+ add_executable(scenetest ${scenetest_SRCS})
+ target_link_libraries(scenetest salt zeitgeist oxygen kerosin)
+endif (NOT WIN32)
-target_link_libraries(scenetest salt zeitgeist oxygen kerosin)
-
########### install files ###############
Modified: trunk/spark/utility/rcssnet/CMakeLists.txt
===================================================================
--- trunk/spark/utility/rcssnet/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/utility/rcssnet/CMakeLists.txt 2009-03-07 08:14:16 UTC (rev 54)
@@ -21,7 +21,7 @@
udpsocket.cpp
)
-add_library(rcssnet3D SHARED ${rcssnet3D_LIB_SRCS} ${rcssnet3D_LIB_HDRS})
+add_library(rcssnet3D ${rcssnet3D_LIB_SRCS} ${rcssnet3D_LIB_HDRS})
if(WIN32)
target_link_libraries(rcssnet3D ${NET_LIBS} WS2_32.lib)
Modified: trunk/spark/utility/tinyxml/CMakeLists.txt
===================================================================
--- trunk/spark/utility/tinyxml/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/utility/tinyxml/CMakeLists.txt 2009-03-07 08:14:16 UTC (rev 54)
@@ -11,7 +11,7 @@
xmlfunctions.h
)
-add_library(tinyxml_ex SHARED ${tinyxml_ex_LIB_SRCS})
+add_library(tinyxml_ex ${tinyxml_ex_LIB_SRCS})
target_link_libraries(tinyxml_ex)
Deleted: trunk/spark/windows/sparkconfig.h
===================================================================
--- trunk/spark/windows/sparkconfig.h 2009-03-05 20:10:36 UTC (rev 53)
+++ trunk/spark/windows/sparkconfig.h 2009-03-07 08:14:16 UTC (rev 54)
@@ -1,11 +0,0 @@
-/** this is a static (i.e. not auto generated) win32 specific
- configuration file
-*/
-#define HAVE_KEROSIN_KEROSIN_H 1
-
-#define PACKAGE_NAME "simspark"
-
-#define HAVE_WINSOCK2_H 1
-#define HAVE_SOCKET 1
-#define HAVE_SOCKETTYPE 1
-#define HAVE_IL_IL_H 1
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-03-05 20:10:39
|
Revision: 53
http://simspark.svn.sourceforge.net/simspark/?rev=53&view=rev
Author: hedayat
Date: 2009-03-05 20:10:36 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
Added new logos
Using the new icon in .desktop file
Some CMake cleanups
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/linux/rcssserver3d.desktop
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
trunk/rcssserver3d/simspark/CMakeLists.txt
trunk/rsgedit/CMakeLists.txt
trunk/simspark-utilities/CMakeLists.txt
trunk/spark/CMakeLists.txt
trunk/spark/lib/CMakeLists.txt
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/plugin/filesystemzip/CMakeLists.txt
trunk/spark/plugin/imageperceptor/CMakeLists.txt
trunk/spark/plugin/openglsyssdl/CMakeLists.txt
trunk/spark/plugin/rosimporter/CMakeLists.txt
trunk/spark/spark/CMakeLists.txt
trunk/spark/test/fonttest/CMakeLists.txt
trunk/spark/test/inputtest/CMakeLists.txt
trunk/spark/test/scenetest/CMakeLists.txt
trunk/spark/utility/rcssnet/socketstreambuf.hpp
Added Paths:
-----------
trunk/rcssserver3d/data/logos/
trunk/rcssserver3d/data/logos/simspark.png
trunk/rcssserver3d/data/logos/simsparklogo.png
trunk/rcssserver3d/data/logos/simsparklogo2.png
Removed Paths:
-------------
trunk/rcssserver3d/linux/rcssserver3d.png
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -17,6 +17,10 @@
find_package(SDL REQUIRED)
########## add extra flags ##########
+if(NOT CMAKE_BUILD_TYPE)
+ set (CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS})
if (UNIX)
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/ChangeLog 2009-03-05 20:10:36 UTC (rev 53)
@@ -1,3 +1,14 @@
+2009-03-05 Hedayat Vatankhah <he...@gr...>
+
+ * linux/rcssserver3d.desktop:
+ - updated the icon name
+
+ * data/logos/simspark.png:
+ * data/logos/simsparklogo.png:
+ * data/logos/simsparklogo2.png:
+ - added simspark logos created by Joschka, and a 48x48 version of
+ simsparklogo.png which can be used as an icon
+
2009-02-09 Hedayat Vatankhah <he...@gr...>
* doc/users/user-manual.tex:
Added: trunk/rcssserver3d/data/logos/simspark.png
===================================================================
(Binary files differ)
Property changes on: trunk/rcssserver3d/data/logos/simspark.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/rcssserver3d/data/logos/simsparklogo.png
===================================================================
(Binary files differ)
Property changes on: trunk/rcssserver3d/data/logos/simsparklogo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/rcssserver3d/data/logos/simsparklogo2.png
===================================================================
(Binary files differ)
Property changes on: trunk/rcssserver3d/data/logos/simsparklogo2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/rcssserver3d/linux/rcssserver3d.desktop
===================================================================
--- trunk/rcssserver3d/linux/rcssserver3d.desktop 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/linux/rcssserver3d.desktop 2009-03-05 20:10:36 UTC (rev 53)
@@ -3,8 +3,7 @@
Name=RoboCup Soccer Server 3D
Comment=RoboCup Soccer Simulation Server 3D
Exec=simspark
-Icon=rcssserver3d
+Icon=simspark
Terminal=false
Type=Application
Categories=Education;Science;Robotics;
-
Deleted: trunk/rcssserver3d/linux/rcssserver3d.png
===================================================================
(Binary files differ)
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -115,13 +115,9 @@
add_library(soccer MODULE ${soccer_LIB_SRCS} ${soccer_LIB_HDRS})
-if (APPLE)
- target_link_libraries(soccer ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
- ${OPENGL_gl_LIBRARY})
-else (APPLE)
- target_link_libraries(soccer)
-endif (APPLE)
+target_link_libraries(soccer ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${OPENGL_gl_LIBRARY})
set_target_properties(soccer PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS soccer DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
@@ -131,4 +127,3 @@
install(DIRECTORY ./ DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME}/soccer
FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
-
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -25,12 +25,8 @@
add_library(soccermonitor MODULE ${soccermonitor_LIB_SRCS}
${soccermonitor_LIB_HDRS})
-if (APPLE)
- target_link_libraries(soccermonitor ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES})
-else (APPLE)
- target_link_libraries(soccermonitor)
-endif (APPLE)
+target_link_libraries(soccermonitor ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES})
set_target_properties(soccermonitor PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS soccermonitor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -18,14 +18,9 @@
add_executable(rcssagent3d ${rcssagent3d_SRCS})
-if (APPLE)
- target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
- ${RCSSNET3D_LIBRARIES})
-else (APPLE)
- target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
-endif (APPLE)
+target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${RCSSNET3D_LIBRARIES})
set_target_properties(rcssagent3d PROPERTIES
INSTALL_RPATH "${RPATH_DIRECTORIES}")
Modified: trunk/rcssserver3d/simspark/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/simspark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/simspark/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -7,22 +7,16 @@
add_executable(simspark ${simspark_SRCS})
if (APPLE)
- include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
- ${SDL_INCLUDE_DIR})
-
- target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
- ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
-else (APPLE)
- include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
-
- target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+ set(SDL_LINK_LIBS ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
endif (APPLE)
+include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
+ ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
+ ${SDL_INCLUDE_DIR})
+target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${SDL_LINK_LIBS})
set_target_properties(simspark PROPERTIES INSTALL_RPATH "${RPATH_DIRECTORIES}")
install(TARGETS simspark DESTINATION ${BINDIR})
Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rsgedit/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -9,6 +9,10 @@
find_package(wxWidgets REQUIRED gl base core adv)
########## add extra flags ##########
+if(NOT CMAKE_BUILD_TYPE)
+ set (CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR})
if (UNIX)
Modified: trunk/simspark-utilities/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/simspark-utilities/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -9,6 +9,10 @@
find_package(Boost REQUIRED)
########## add extra flags ##########
+if(NOT CMAKE_BUILD_TYPE)
+ set (CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
add_definitions(-DHAVE_CONFIG_H)
if (UNIX)
set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -25,8 +25,7 @@
check_include_file("CoreFoundation/CoreFoundation.h"
HAVE_COREFOUNDATION_COREFOUNDATION_H)
-if (USE_COREFOUNDATION STREQUAL "OFF")
-else (USE_COREFOUNDATION STREQUAL "OFF")
+if (NOT USE_COREFOUNDATION STREQUAL "OFF")
if (HAVE_COREFOUNDATION_COREFOUNDATION_H)
set(USE_COREFOUNDATION ON)
message("USE_COREFOUNDATION ON")
@@ -34,7 +33,7 @@
set(USE_COREFOUNDATION OFF)
message("USE_COREFOUNDATION OFF")
endif (HAVE_COREFOUNDATION_COREFOUNDATION_H)
-endif (USE_COREFOUNDATION STREQUAL "OFF")
+endif (NOT USE_COREFOUNDATION STREQUAL "OFF")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
if(WIN32)
@@ -89,6 +88,10 @@
########## add extra flags ##########
+if(NOT CMAKE_BUILD_TYPE)
+ set (CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR})
if (UNIX)
@@ -110,7 +113,8 @@
if(WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
- include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
+ include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/windows/include)
endif(WIN32)
########## library version numbers ##########
Modified: trunk/spark/lib/CMakeLists.txt
===================================================================
--- trunk/spark/lib/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/lib/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -1,4 +1,5 @@
-include_directories(${CMAKE_SOURCE_DIR}/utility ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/utility ${Boost_INCLUDE_DIRS}
+ ${ODE_INCLUDE_DIR})
if (USE_COREFOUNDATION)
add_definitions(-DUSE_COREFOUNDATION)
Modified: trunk/spark/lib/kerosin/CMakeLists.txt
===================================================================
--- trunk/spark/lib/kerosin/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/lib/kerosin/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -116,11 +116,7 @@
renderserver/customrender_c.cpp
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
-endif(WIN32)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
add_library(kerosin SHARED ${kerosin_LIB_SRCS} ${kerosin_LIB_HDRS})
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -221,7 +221,8 @@
add_library(oxygen SHARED ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
-target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES} ${ODE_LIBRARY} ${oxygen_require_libs})
+target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES}
+ ${ODE_LIBRARY} ${oxygen_require_libs})
set_target_properties(oxygen PROPERTIES VERSION ${OXYGEN_VERSION}
SOVERSION ${OXYGEN_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/plugin/filesystemzip/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -11,9 +11,9 @@
if (Boost_REGEX_FOUND)
add_library(filesystemzip MODULE ${filesystemzip_LIB_SRCS})
- if(WIN32)
- include_directories(${ZLIB_INCLUDE_DIR})
- endif(WIN32)
+ if(WIN32)
+ include_directories(${ZLIB_INCLUDE_DIR})
+ endif(WIN32)
target_link_libraries(filesystemzip ${Boost_REGEX_LIBRARY} ${spark_libs} z)
Modified: trunk/spark/plugin/imageperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -8,10 +8,6 @@
imageperceptor_c.cpp
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/windows/include)
-endif(WIN32)
-
add_library(imageperceptor MODULE ${imageperceptor_LIB_SRCS})
target_link_libraries(imageperceptor ${spark_libs})
Modified: trunk/spark/plugin/openglsyssdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -8,9 +8,7 @@
openglsystemsdl_c.cpp
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/windows/include ${SDL_INCLUDE_DIR})
-endif(WIN32)
+include_directories(${SDL_INCLUDE_DIR})
add_library(openglsyssdl MODULE ${openglsyssdl_LIB_SRCS})
Modified: trunk/spark/plugin/rosimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -9,10 +9,6 @@
rosimporter_c.cpp
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/windows/include)
-endif(WIN32)
-
add_library(rosimporter MODULE ${rosimporter_LIB_SRCS})
target_link_libraries(rosimporter tinyxml_ex ${spark_libs})
Modified: trunk/spark/spark/CMakeLists.txt
===================================================================
--- trunk/spark/spark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/spark/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -5,19 +5,12 @@
spark.h
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
-endif(WIN32)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${DevIL_INCLUDE_DIR})
add_library(spark SHARED ${spark_LIB_SRCS})
-if (APPLE)
- target_link_libraries(spark salt zeitgeist oxygen kerosin)
-else (APPLE)
- target_link_libraries(spark)
-endif (APPLE)
+target_link_libraries(spark salt zeitgeist oxygen kerosin)
set_target_properties(spark PROPERTIES VERSION ${SPARK_VERSION}
SOVERSION ${SPARK_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/test/fonttest/CMakeLists.txt
===================================================================
--- trunk/spark/test/fonttest/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/test/fonttest/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -5,11 +5,8 @@
main.cpp
)
-if(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
-endif(WIN32)
+include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
+ ${DevIL_INCLUDE_DIR})
add_executable(fonttest ${fonttest_SRCS})
Modified: trunk/spark/test/inputtest/CMakeLists.txt
===================================================================
--- trunk/spark/test/inputtest/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/test/inputtest/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -5,11 +5,8 @@
main.cpp
)
-if(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
-endif(WIN32)
+include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
+ ${DevIL_INCLUDE_DIR})
add_executable(inputtest ${inputtest_SRCS})
Modified: trunk/spark/test/scenetest/CMakeLists.txt
===================================================================
--- trunk/spark/test/scenetest/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/test/scenetest/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -8,11 +8,8 @@
md5mesh_c.cpp
)
-if(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
-endif(WIN32)
+include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
+ ${DevIL_INCLUDE_DIR})
add_executable(scenetest ${scenetest_SRCS})
Modified: trunk/spark/utility/rcssnet/socketstreambuf.hpp
===================================================================
--- trunk/spark/utility/rcssnet/socketstreambuf.hpp 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/utility/rcssnet/socketstreambuf.hpp 2009-03-05 20:10:36 UTC (rev 53)
@@ -4,7 +4,7 @@
socketstreambuf.hpp - A socket stream buffer
-------------------
begin : 08-JAN-2003
- copyright : (C) 2003 by The RoboCup Soccer Server
+ copyright : (C) 2003 by The RoboCup Soccer Server
Maintenance Group.
email : sse...@li...
***************************************************************************/
@@ -25,6 +25,7 @@
//g++ 2.95.6 doesn't have the streambuf header, so iostream is used instead
//#include <streambuf>
#include<iostream>
+#include <cstdio>
#include "socket.hpp"
@@ -43,7 +44,7 @@
public:
SocketStreamBuf( Socket& socket,
const Addr& dest,
- ConnType conn = CONN_ON_READ,
+ ConnType conn = CONN_ON_READ,
std::streamsize bufsize = 8192 )
: m_socket( socket ),
m_end_point( dest ),
@@ -54,7 +55,7 @@
m_connect( conn )
{}
-
+
SocketStreamBuf( Socket& socket,
ConnType conn = NO_CONN,
std::streamsize bufsize = 8192 )
@@ -73,16 +74,16 @@
delete [] m_inbuf;
delete [] m_outbuf;
}
-
+
void
setEndPoint( const Addr& addr )
{ m_end_point = addr; }
-
+
void
setConnectType( ConnType conn )
{ m_connect = conn; }
-
+
protected:
virtual
bool
@@ -97,14 +98,14 @@
else
return m_socket.send( m_outbuf, size, m_end_point ) > 0;
}
-
+
virtual
int_type
overflow( int_type c = EOF )
{
// this method is supposed to flush the put area of the buffer
// to the I/O device
-
+
// if the buffer was not already allocated nor set by user,
// do it just now
if( pptr() == NULL )
@@ -123,9 +124,9 @@
sputc( c );
return 0;
}
-
+
virtual
- int
+ int
sync()
{
if( pptr() != NULL )
@@ -139,25 +140,25 @@
}
return 0;
}
-
+
virtual
int_type
underflow()
{
// this method is supposed to read some bytes from the I/O device
-
+
// if the buffer was not already allocated nor set by user,
// do it just now
if( gptr() == NULL )
{
m_inbuf = new char_type[m_bufsize];
}
-
+
if( m_remained != 0 )
m_inbuf[0] = m_remained_char;
-
- int readn = m_bufsize * sizeof( char_type ) - m_remained;
+
+ int readn = m_bufsize * sizeof( char_type ) - m_remained;
if( m_socket.isConnected() )
readn = m_socket.recv( m_inbuf + m_remained,
readn );
@@ -170,7 +171,7 @@
if( m_connect == CONN_ON_READ && readn > 0 )
m_socket.connect( addr );
}
-
+
if( readn < 0 || ( readn == 1 && (m_inbuf + m_remained)[ 0 ] == -1 ) )
{
(m_inbuf + m_remained)[ 0 ] = -1;
@@ -179,23 +180,23 @@
int totalbytes = readn + m_remained;
setg( m_inbuf, m_inbuf,
m_inbuf + totalbytes / sizeof(char_type) );
-
+
m_remained = totalbytes % sizeof( char_type );
if( m_remained != 0 )
m_remained_char = m_inbuf[totalbytes / sizeof(char_type)];
-
+
return sgetc();
}
-
+
private:
-
+
// not used
SocketStreamBuf( const SocketStreamBuf& );
-
+
// not used
- SocketStreamBuf&
+ SocketStreamBuf&
operator=( const SocketStreamBuf& );
-
+
Socket& m_socket;
Addr m_end_point;
std::streamsize m_bufsize;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tk...@us...> - 2009-03-05 13:43:03
|
Revision: 52
http://simspark.svn.sourceforge.net/simspark/?rev=52&view=rev
Author: tknrkb
Date: 2009-03-05 13:42:41 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
Cmake OSX suppot.
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/cmake/FindSpark.cmake
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
trunk/rcssserver3d/simspark/CMakeLists.txt
trunk/rcssserver3d/simspark/main.cpp
trunk/spark/CMakeLists.txt
trunk/spark/lib/CMakeLists.txt
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/lib/salt/CMakeLists.txt
trunk/spark/lib/salt/fileclasses.cpp
trunk/spark/lib/zeitgeist/CMakeLists.txt
trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
trunk/spark/plugin/CMakeLists.txt
trunk/spark/plugin/collisionperceptor/CMakeLists.txt
trunk/spark/plugin/filesystemrar/CMakeLists.txt
trunk/spark/plugin/filesystemstd/CMakeLists.txt
trunk/spark/plugin/filesystemzip/CMakeLists.txt
trunk/spark/plugin/forceeffector/CMakeLists.txt
trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt
trunk/spark/plugin/imageperceptor/CMakeLists.txt
trunk/spark/plugin/imageperceptor/imageperceptor.cpp
trunk/spark/plugin/inputsdl/CMakeLists.txt
trunk/spark/plugin/inputwx/CMakeLists.txt
trunk/spark/plugin/objimporter/CMakeLists.txt
trunk/spark/plugin/openglsyssdl/CMakeLists.txt
trunk/spark/plugin/openglsyswx/CMakeLists.txt
trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt
trunk/spark/plugin/rosimporter/CMakeLists.txt
trunk/spark/plugin/rubysceneimporter/CMakeLists.txt
trunk/spark/plugin/sceneeffector/CMakeLists.txt
trunk/spark/plugin/sexpparser/CMakeLists.txt
trunk/spark/plugin/soundsystembass/CMakeLists.txt
trunk/spark/plugin/soundsystemfmod/CMakeLists.txt
trunk/spark/plugin/sparkagent/CMakeLists.txt
trunk/spark/plugin/sparkmonitor/CMakeLists.txt
trunk/spark/spark/CMakeLists.txt
trunk/spark/test/CMakeLists.txt
trunk/spark/utility/CMakeLists.txt
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -12,10 +12,13 @@
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
find_package(Spark REQUIRED)
find_package(Freetype REQUIRED)
+find_package(Boost REQUIRED)
+find_package(OpenGL REQUIRED)
+find_package(SDL REQUIRED)
########## add extra flags ##########
add_definitions(-DHAVE_CONFIG_H)
-include_directories(${CMAKE_BINARY_DIR})
+include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS})
if (UNIX)
set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
STRING "Common C++ compiler flags" FORCE)
Modified: trunk/rcssserver3d/cmake/FindSpark.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindSpark.cmake 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/cmake/FindSpark.cmake 2009-03-05 13:42:41 UTC (rev 52)
@@ -17,6 +17,9 @@
# KEROSIN_INCLUDE_DIR - where to find kerosin include files
# KEROSIN_LIBRARIES - List of libraries when using kerosin.
# KEROSIN_FOUND - True if kerosin found.
+# RCSSNET3D_INCLUDE_DIR - where to find kerosin include files
+# RCSSNET3D_LIBRARIES - List of libraries when using kerosin.
+# RCSSNET3D_FOUND - True if kerosin found.
# Spark section
IF (SPARK_INCLUDE_DIR)
@@ -143,3 +146,28 @@
ENDIF(KEROSIN_FOUND)
MARK_AS_ADVANCED( KEROSIN_LIBRARY KEROSIN_INCLUDE_DIR )
+
+# rcssnet3D
+IF (RCSSNET3D_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(RCSSNET3D_FIND_QUIETLY TRUE)
+ENDIF (RCSSNET3D_INCLUDE_DIR)
+
+FIND_PATH(RCSSNET3D_INCLUDE_DIR rcssnet/addr.hpp PATH_SUFFIXES simspark)
+
+SET(RCSSNET3D_NAMES rcssnet3D rcssnet3D_debug)
+FIND_LIBRARY(RCSSNET3D_LIBRARY NAMES ${RCSSNET3D_NAMES} PATH_SUFFIXES simspark )
+
+# handle the QUIETLY and REQUIRED arguments and set RCSSNET3D_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(RCSSNET3D DEFAULT_MSG RCSSNET3D_LIBRARY
+ RCSSNET3D_INCLUDE_DIR)
+
+IF(RCSSNET3D_FOUND)
+ SET( RCSSNET3D_LIBRARIES ${RCSSNET3D_LIBRARY} )
+ELSE(RCSSNET3D_FOUND)
+ SET( RCSSNET3D_LIBRARIES )
+ENDIF(RCSSNET3D_FOUND)
+
+MARK_AS_ADVANCED( RCSSNET3D_LIBRARY RCSSNET3D_INCLUDE_DIR )
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -115,7 +115,13 @@
add_library(soccer MODULE ${soccer_LIB_SRCS} ${soccer_LIB_HDRS})
-target_link_libraries(soccer)
+if (APPLE)
+ target_link_libraries(soccer ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${OPENGL_gl_LIBRARY})
+else (APPLE)
+ target_link_libraries(soccer)
+endif (APPLE)
set_target_properties(soccer PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS soccer DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -25,7 +25,12 @@
add_library(soccermonitor MODULE ${soccermonitor_LIB_SRCS}
${soccermonitor_LIB_HDRS})
-target_link_libraries(soccermonitor)
+if (APPLE)
+ target_link_libraries(soccermonitor ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES})
+else (APPLE)
+ target_link_libraries(soccermonitor)
+endif (APPLE)
set_target_properties(soccermonitor PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS soccermonitor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -18,9 +18,15 @@
add_executable(rcssagent3d ${rcssagent3d_SRCS})
-target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
-
+if (APPLE)
+ target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${RCSSNET3D_LIBRARIES})
+else (APPLE)
+ target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+endif (APPLE)
+
set_target_properties(rcssagent3d PROPERTIES
INSTALL_RPATH "${RPATH_DIRECTORIES}")
install(TARGETS rcssagent3d DESTINATION ${BINDIR})
Modified: trunk/rcssserver3d/simspark/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/simspark/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/simspark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -4,14 +4,26 @@
main.cpp
)
-include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
-
add_executable(simspark ${simspark_SRCS})
-target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+if (APPLE)
+ include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
+ ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
+ ${SDL_INCLUDE_DIR})
+ target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
+else (APPLE)
+ include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
+ ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
+
+ target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+endif (APPLE)
+
+
+
set_target_properties(simspark PROPERTIES INSTALL_RPATH "${RPATH_DIRECTORIES}")
install(TARGETS simspark DESTINATION ${BINDIR})
Modified: trunk/rcssserver3d/simspark/main.cpp
===================================================================
--- trunk/rcssserver3d/simspark/main.cpp 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/simspark/main.cpp 2009-03-05 13:42:41 UTC (rev 52)
@@ -30,6 +30,10 @@
#include <rcssserver3d_config.h>
#endif
+#if __APPLE__
+#include <SDL.h>
+#endif
+
using namespace spark;
using namespace kerosin;
using namespace oxygen;
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -21,9 +21,21 @@
check_include_file("execinfo.h" HAVE_EXECINFO_H)
check_include_file("unistd.h" HAVE_UNISTD_H)
check_include_file("poll.h" HAVE_POLL_H)
+
check_include_file("CoreFoundation/CoreFoundation.h"
- HAVE_COREFOUNDATION_COREFOUNDATION_H)
+ HAVE_COREFOUNDATION_COREFOUNDATION_H)
+if (USE_COREFOUNDATION STREQUAL "OFF")
+else (USE_COREFOUNDATION STREQUAL "OFF")
+ if (HAVE_COREFOUNDATION_COREFOUNDATION_H)
+ set(USE_COREFOUNDATION ON)
+ message("USE_COREFOUNDATION ON")
+ else (HAVE_COREFOUNDATION_COREFOUNDATION_H)
+ set(USE_COREFOUNDATION OFF)
+ message("USE_COREFOUNDATION OFF")
+ endif (HAVE_COREFOUNDATION_COREFOUNDATION_H)
+endif (USE_COREFOUNDATION STREQUAL "OFF")
+
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
if(WIN32)
find_package(zlib REQUIRED)
@@ -185,3 +197,5 @@
#include $(top_srcdir)/config.aux/sf.am
#
#include $(top_srcdir)/config.aux/cvs.am
+
+
Modified: trunk/spark/lib/CMakeLists.txt
===================================================================
--- trunk/spark/lib/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -1,3 +1,18 @@
+include_directories(${CMAKE_SOURCE_DIR}/utility ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
+
+if (USE_COREFOUNDATION)
+ add_definitions(-DUSE_COREFOUNDATION)
+endif (USE_COREFOUNDATION)
+
+if (APPLE)
+ if (USE_COREFOUNDATION)
+ set(salt_require_libs /System/Library/Frameworks/CoreFoundation.framework)
+ endif (USE_COREFOUNDATION)
+ set(zeitgeist_require_libs salt ${salt_require_libs})
+ set(oxygen_require_libs zeitgeist ${zeitgeist_require_libs})
+ set(kerosin_require_libs oxygen ${oxygen_require_libs})
+endif (APPLE)
+
add_subdirectory(salt)
add_subdirectory(zeitgeist)
add_subdirectory(oxygen)
Modified: trunk/spark/lib/kerosin/CMakeLists.txt
===================================================================
--- trunk/spark/lib/kerosin/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/kerosin/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -125,7 +125,7 @@
add_library(kerosin SHARED ${kerosin_LIB_SRCS} ${kerosin_LIB_HDRS})
target_link_libraries(kerosin ${FREETYPE_LIBRARIES} ${DevIL_LIBRARIES}
- ${SDL_LIBRARY} ${OPENGL_LIBRARIES})
+ ${SDL_LIBRARY} ${OPENGL_LIBRARIES} ${kerosin_require_libs})
set_target_properties(kerosin PROPERTIES VERSION ${KEROSIN_VERSION}
SOVERSION ${KEROSIN_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -221,7 +221,7 @@
add_library(oxygen SHARED ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
-target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES} ${ODE_LIBRARY})
+target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES} ${ODE_LIBRARY} ${oxygen_require_libs})
set_target_properties(oxygen PROPERTIES VERSION ${OXYGEN_VERSION}
SOVERSION ${OXYGEN_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/lib/salt/CMakeLists.txt
===================================================================
--- trunk/spark/lib/salt/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/salt/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -28,7 +28,7 @@
add_library(salt SHARED ${salt_LIB_SRCS} ${salt_LIB_HDRS})
-target_link_libraries(salt libobject)
+target_link_libraries(salt libobject ${salt_require_libs})
set_target_properties(salt PROPERTIES VERSION ${SALT_VERSION}
SOVERSION ${SALT_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/lib/salt/fileclasses.cpp
===================================================================
--- trunk/spark/lib/salt/fileclasses.cpp 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/salt/fileclasses.cpp 2009-03-05 13:42:41 UTC (rev 52)
@@ -26,9 +26,11 @@
#include <sparkconfig.h>
#endif
+#if USE_COREFOUNDATION
#if HAVE_COREFOUNDATION_COREFOUNDATION_H
#include <CoreFoundation/CoreFoundation.h>
#endif
+#endif
namespace salt
{
@@ -60,6 +62,7 @@
std::string
RFile::BundlePath()
{
+#if USE_COREFOUNDATION
#if HAVE_COREFOUNDATION_COREFOUNDATION_H
char path[1024];
CFBundleRef mainBundle = CFBundleGetMainBundle();
@@ -77,6 +80,7 @@
CFRelease(cfStringRef);
return std::string(path) + Sep();
+#endif
#else
# ifdef PREFIX
return PREFIX + Sep() + "share" + Sep() + PACKAGE_NAME + Sep();
Modified: trunk/spark/lib/zeitgeist/CMakeLists.txt
===================================================================
--- trunk/spark/lib/zeitgeist/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/zeitgeist/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -58,7 +58,7 @@
add_library(zeitgeist SHARED ${zeitgeist_LIB_SRCS} ${zeitgeist_LIB_HDRS})
-target_link_libraries(zeitgeist ${RUBY_LIBRARY})
+target_link_libraries(zeitgeist ${RUBY_LIBRARY} ${zeitgeist_require_libs})
set_target_properties(zeitgeist PROPERTIES VERSION ${ZEITGEIST_VERSION}
SOVERSION ${ZEITGEIST_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2009-03-05 13:42:41 UTC (rev 52)
@@ -586,8 +586,10 @@
// get the (OS specific) path to the script directory
string pkgdatadir = salt::RFile::BundlePath();
#if __APPLE__
+#if USE_COREFOUNDATION
pkgdatadir += "Contents/Resources/";
#endif
+#endif
ERunScriptErrorType result = eNotFound;
Modified: trunk/spark/plugin/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -1,5 +1,14 @@
-include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
+ ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+if (APPLE)
+ if (USE_COREFOUNDATION)
+ set(spark_libs kerosin oxygen zeitgeist salt /System/Library/Frameworks/CoreFoundation.framework)
+ else (USE_COREFOUNDATION)
+ set(spark_libs kerosin oxygen zeitgeist salt)
+ endif (USE_COREFOUNDATION)
+endif (APPLE)
+
add_subdirectory(filesystemstd)
add_subdirectory(filesystemzip)
add_subdirectory(forceeffector)
@@ -18,4 +27,10 @@
add_subdirectory(soundsystemfmod)
add_subdirectory(inputwx)
add_subdirectory(openglsyswx)
-add_subdirectory(imageperceptor)
+if (APPLE)
+ if (DEVEL)
+ add_subdirectory(imageperceptor)
+ endif (DEVEL)
+else (APPLE)
+ add_subdirectory(imageperceptor)
+endif (APPLE)
Modified: trunk/spark/plugin/collisionperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/collisionperceptor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/collisionperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -22,7 +22,7 @@
add_library(collisionperceptor MODULE ${collisionperceptor_LIB_SRCS})
-target_link_libraries(collisionperceptor)
+target_link_libraries(collisionperceptor ${spark_libs})
set_target_properties(collisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS collisionperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemrar/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemrar/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/filesystemrar/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(filesystemrar MODULE ${filesystemrar_LIB_SRCS})
-target_link_libraries(filesystemrar)
+target_link_libraries(filesystemrar ${spark_libs})
set_target_properties(filesystemrar PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS filesystemrar DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemstd/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemstd/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/filesystemstd/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(filesystemstd MODULE ${filesystemstd_LIB_SRCS})
-target_link_libraries(filesystemstd)
+target_link_libraries(filesystemstd ${spark_libs})
set_target_properties(filesystemstd PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS filesystemstd DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemzip/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -15,7 +15,7 @@
include_directories(${ZLIB_INCLUDE_DIR})
endif(WIN32)
- target_link_libraries(filesystemzip ${Boost_REGEX_LIBRARY})
+ target_link_libraries(filesystemzip ${Boost_REGEX_LIBRARY} ${spark_libs} z)
set_target_properties(filesystemzip PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS filesystemzip DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/forceeffector/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/forceeffector/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/forceeffector/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -11,7 +11,7 @@
add_library(forceeffector MODULE ${forceeffector_LIB_SRCS})
-target_link_libraries(forceeffector)
+target_link_libraries(forceeffector ${spark_libs})
set_target_properties(forceeffector PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS forceeffector DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(gyrorateperceptor MODULE ${gyrorateperceptor_LIB_SRCS})
-target_link_libraries(gyrorateperceptor)
+target_link_libraries(gyrorateperceptor ${spark_libs})
set_target_properties(gyrorateperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS gyrorateperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/imageperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -14,7 +14,9 @@
add_library(imageperceptor MODULE ${imageperceptor_LIB_SRCS})
-target_link_libraries(imageperceptor)
+target_link_libraries(imageperceptor ${spark_libs})
set_target_properties(imageperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
-install(TARGETS imageperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
+if (NOT APPLE)
+ install(TARGETS imageperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
+endif (NOT APPLE)
Modified: trunk/spark/plugin/imageperceptor/imageperceptor.cpp
===================================================================
--- trunk/spark/plugin/imageperceptor/imageperceptor.cpp 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/imageperceptor/imageperceptor.cpp 2009-03-05 13:42:41 UTC (rev 52)
@@ -22,7 +22,11 @@
// #include <IL/ilu.h>
// #include <sstream>
#ifndef WIN32
+#if __APPLE__
+#include <OpenGL/gl.h>
+#else
#include <GL/gl.h>
+#endif
#else
#include <windows.h>
#include <GL/gl.h>
Modified: trunk/spark/plugin/inputsdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputsdl/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/inputsdl/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -23,7 +23,7 @@
add_library(inputsdl MODULE ${inputsdl_LIB_SRCS})
-target_link_libraries(inputsdl)
+target_link_libraries(inputsdl ${spark_libs})
set_target_properties(inputsdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS inputsdl DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/inputwx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputwx/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/inputwx/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -15,7 +15,7 @@
add_definitions(${wxWidgets_DEFINITIONS})
add_library(inputwx MODULE ${inputwx_LIB_SRCS})
- target_link_libraries(inputwx)
+ target_link_libraries(inputwx ${wxWidgets_LIBRARIES} ${spark_libs})
set_target_properties(inputwx PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
set_target_properties(inputwx PROPERTIES VERSION 0.0.0 SOVERSION 0)
Modified: trunk/spark/plugin/objimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/objimporter/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/objimporter/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(objimporter MODULE ${objimporter_LIB_SRCS})
-target_link_libraries(objimporter)
+target_link_libraries(objimporter ${spark_libs})
set_target_properties(objimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS objimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/openglsyssdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -14,7 +14,7 @@
add_library(openglsyssdl MODULE ${openglsyssdl_LIB_SRCS})
-target_link_libraries(openglsyssdl)
+target_link_libraries(openglsyssdl ${spark_libs})
set_target_properties(openglsyssdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS openglsyssdl DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/openglsyswx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyswx/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/openglsyswx/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -13,7 +13,7 @@
add_definitions(${wxWidgets_DEFINITIONS})
add_library(openglsyswx MODULE ${openglsyswx_LIB_SRCS})
- target_link_libraries(openglsyswx)
+ target_link_libraries(openglsyswx ${wxWidgets_LIBRARIES} ${spark_libs})
set_target_properties(openglsyswx PROPERTIES VERSION 0.0.0 SOVERSION 0)
set_target_properties(inputwx PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
Modified: trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(perfectvisionperceptor MODULE ${perfectvisionperceptor_LIB_SRCS})
-target_link_libraries(perfectvisionperceptor)
+target_link_libraries(perfectvisionperceptor ${spark_libs})
set_target_properties(perfectvisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS perfectvisionperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/rosimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -15,7 +15,7 @@
add_library(rosimporter MODULE ${rosimporter_LIB_SRCS})
-target_link_libraries(rosimporter tinyxml_ex)
+target_link_libraries(rosimporter tinyxml_ex ${spark_libs})
set_target_properties(rosimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS rosimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/rubysceneimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/rubysceneimporter/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/rubysceneimporter/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -9,7 +9,7 @@
add_library(rubysceneimporter MODULE ${rubysceneimporter_LIB_SRCS})
-target_link_libraries(rubysceneimporter sexp)
+target_link_libraries(rubysceneimporter sexp ${spark_libs})
set_target_properties(rubysceneimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS rubysceneimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sceneeffector/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sceneeffector/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/sceneeffector/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -11,7 +11,7 @@
add_library(sceneeffector MODULE ${sceneeffector_LIB_SRCS})
-target_link_libraries(sceneeffector)
+target_link_libraries(sceneeffector ${spark_libs})
set_target_properties(sceneeffector PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS sceneeffector DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sexpparser/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sexpparser/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/sexpparser/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -9,7 +9,7 @@
add_library(sexpparser MODULE ${sexpparser_LIB_SRCS})
-target_link_libraries(sexpparser sexp)
+target_link_libraries(sexpparser sexp ${spark_libs})
set_target_properties(sexpparser PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS sexpparser DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/soundsystembass/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/soundsystembass/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/soundsystembass/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -16,7 +16,7 @@
add_library(soundsystembass MODULE ${soundsystembass_LIB_SRCS})
-target_link_libraries(soundsystembass)
+target_link_libraries(soundsystembass ${spark_libs})
set_target_properties(soundsystembass PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS soundsystembass DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/soundsystemfmod/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/soundsystemfmod/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/soundsystemfmod/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -20,7 +20,7 @@
add_library(soundsystemfmod MODULE ${soundsystemfmod_LIB_SRCS})
- target_link_libraries(soundsystemfmod ${FMOD_LIBRARIES})
+ target_link_libraries(soundsystemfmod ${FMOD_LIBRARIES} ${spark_libs})
set_target_properties(soundsystemfmod PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS soundsystemfmod DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sparkagent/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sparkagent/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/sparkagent/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -31,7 +31,7 @@
add_library(sparkagent MODULE ${sparkagent_LIB_SRCS})
-target_link_libraries(sparkagent)
+target_link_libraries(sparkagent ${spark_libs})
set_target_properties(sparkagent PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS sparkagent DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sparkmonitor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sparkmonitor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/sparkmonitor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -15,7 +15,7 @@
add_library(sparkmonitor MODULE ${sparkmonitor_LIB_SRCS})
-target_link_libraries(sparkmonitor sexp)
+target_link_libraries(sparkmonitor sexp ${spark_libs})
set_target_properties(sparkmonitor PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS sparkmonitor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/spark/CMakeLists.txt
===================================================================
--- trunk/spark/spark/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/spark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -8,12 +8,16 @@
if(WIN32)
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
else(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS})
+ include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
endif(WIN32)
add_library(spark SHARED ${spark_LIB_SRCS})
-target_link_libraries(spark)
+if (APPLE)
+ target_link_libraries(spark salt zeitgeist oxygen kerosin)
+else (APPLE)
+ target_link_libraries(spark)
+endif (APPLE)
set_target_properties(spark PROPERTIES VERSION ${SPARK_VERSION}
SOVERSION ${SPARK_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/test/CMakeLists.txt
===================================================================
--- trunk/spark/test/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/test/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -1,4 +1,5 @@
-include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
+ ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
add_subdirectory(coretest)
add_subdirectory(fonttest)
Modified: trunk/spark/utility/CMakeLists.txt
===================================================================
--- trunk/spark/utility/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/utility/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -1,3 +1,5 @@
+include_directories(${CMAKE_SOURCE_DIR}/lib ${Boost_INCLUDE_DIRS})
+
add_subdirectory(libobj)
add_subdirectory(rcssnet)
add_subdirectory(sfsexp)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-02-17 11:54:58
|
Revision: 51
http://simspark.svn.sourceforge.net/simspark/?rev=51&view=rev
Author: marianbuchta
Date: 2009-02-17 11:53:43 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Windows platform compatibility:
-add CRT_SECURE_NO_WARNINGS preprocessor definition
-add include directories
-add missing headers files (OpenGL Extension Registry)
Modified Paths:
--------------
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/plugin/filesystemzip/CMakeLists.txt
trunk/spark/plugin/imageperceptor/CMakeLists.txt
trunk/spark/plugin/openglsyssdl/CMakeLists.txt
trunk/spark/plugin/rosimporter/CMakeLists.txt
trunk/spark/spark/CMakeLists.txt
trunk/spark/test/fonttest/CMakeLists.txt
trunk/spark/test/inputtest/CMakeLists.txt
trunk/spark/test/scenetest/CMakeLists.txt
trunk/spark/utility/rcssnet/CMakeLists.txt
Added Paths:
-----------
trunk/spark/windows/include/
trunk/spark/windows/include/GL/
trunk/spark/windows/include/GL/glext.h
trunk/spark/windows/include/GL/glxext.h
trunk/spark/windows/include/GL/wglext.h
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-02-15 12:09:44 UTC (rev 50)
+++ trunk/spark/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
@@ -96,6 +96,11 @@
mark_as_advanced(BINDIR LIBDIR DATADIR INCLUDEDIR)
+if(WIN32)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+ include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
+endif(WIN32)
+
########## library version numbers ##########
set(SALT_SO_VERSION 0)
set(SALT_VERSION ${SALT_SO_VERSION}.3.1)
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-02-15 12:09:44 UTC (rev 50)
+++ trunk/spark/ChangeLog 2009-02-17 11:53:43 UTC (rev 51)
@@ -1,3 +1,26 @@
+2009-02-17 Marian Buchta <mar...@gm...>
+
+ * CMakeLists.txt
+ - add CRT_SECURE_NO_WARNINGS
+ - add include directories for Windows platform
+
+ * lib/kerosin/CMakeLists.txt
+ * plugin/filesystemzip/CMakeLists.txt
+ * plugin/imageperceptor/CMakeLists.txt
+ * plugin/openglsyssdl/CMakeLists.txt
+ * plugin/rosimporter/CMakeLists.txt
+ * spark/CMakeLists.txt
+ * test/fonttest/CMakeLists.txt
+ * test/inputtest/CMakeLists.txt
+ * test/scenetest/CMakeLists.txt
+ * utility/rcssnet/CMakeLists.txt
+ - add include directories for Windows platform
+
+ * windows/include/GL/glext.h
+ * windows/include/GL/glxext.h
+ * windows/include/GL/wglext.h
+ - add missing headers files (OpenGL Extension Registry)
+
2009-02-15 Marian Buchta <mar...@gm...>
* CMakeLists.txt
Modified: trunk/spark/lib/kerosin/CMakeLists.txt
===================================================================
--- trunk/spark/lib/kerosin/CMakeLists.txt 2009-02-15 12:09:44 UTC (rev 50)
+++ trunk/spark/lib/kerosin/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
@@ -116,8 +116,11 @@
renderserver/customrender_c.cpp
)
-include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS}
- ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+if(WIN32)
+ include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
+else(WIN32)
+ include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+endif(WIN32)
add_library(kerosin SHARED ${kerosin_LIB_SRCS} ${kerosin_LIB_HDRS})
Modified: trunk/spark/plugin/filesystemzip/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-02-15 12:09:44 UTC (rev 50)
+++ trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
@@ -11,6 +11,10 @@
if (Boost_REGEX_FOUND)
add_library(filesystemzip MODULE ${filesystemzip_LIB_SRCS})
+ if(WIN32)
+ include_directories(${ZLIB_INCLUDE_DIR})
+ endif(WIN32)
+
target_link_libraries(filesystemzip ${Boost_REGEX_LIBRARY})
set_target_properties(filesystemzip PROPERTIES VERSION 0.0.0 SOVERSION 0)
Modified: trunk/spark/plugin/imageperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-02-15 12:09:44 UTC (rev 50)
+++ trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
@@ -8,6 +8,10 @@
imageperceptor_c.cpp
)
+if(WIN32)
+ include_directories(${CMAKE_SOURCE_DIR}/windows/include)
+endif(WIN32)
+
add_library(imageperceptor MODULE ${imageperceptor_LIB_SRCS})
target_link_libraries(imageperceptor)
Modified: trunk/spark/plugin/openglsyssdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-02-15 12:09:44 UTC (rev 50)
+++ trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
@@ -8,6 +8,10 @@
openglsystemsdl_c.cpp
)
+if(WIN32)
+ include_directories(${CMAKE_SOURCE_DIR}/windows/include ${SDL_INCLUDE_DIR})
+endif(WIN32)
+
add_library(openglsyssdl MODULE ${openglsyssdl_LIB_SRCS})
target_link_libraries(openglsyssdl)
Modified: trunk/spark/plugin/rosimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-02-15 12:09:44 UTC (rev 50)
+++ trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
@@ -9,6 +9,10 @@
rosimporter_c.cpp
)
+if(WIN32)
+ include_directories(${CMAKE_SOURCE_DIR}/windows/include)
+endif(WIN32)
+
add_library(rosimporter MODULE ${rosimporter_LIB_SRCS})
target_link_libraries(rosimporter tinyxml_ex)
Modified: trunk/spark/spark/CMakeLists.txt
===================================================================
--- trunk/spark/spark/CMakeLists.txt 2009-02-15 12:09:44 UTC (rev 50)
+++ trunk/spark/spark/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
@@ -5,8 +5,11 @@
spark.h
)
-include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
- ${FREETYPE_INCLUDE_DIRS})
+if(WIN32)
+ include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
+else(WIN32)
+ include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS})
+endif(WIN32)
add_library(spark SHARED ${spark_LIB_SRCS})
Modified: trunk/spark/test/fonttest/CMakeLists.txt
===================================================================
--- trunk/spark/test/fonttest/CMakeLists.txt 2009-02-15 12:09:44 UTC (rev 50)
+++ trunk/spark/test/fonttest/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
@@ -5,7 +5,11 @@
main.cpp
)
-include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
+if(WIN32)
+ include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
+else(WIN32)
+ include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
+endif(WIN32)
add_executable(fonttest ${fonttest_SRCS})
Modified: trunk/spark/test/inputtest/CMakeLists.txt
===================================================================
--- trunk/spark/test/inputtest/CMakeLists.txt 2009-02-15 12:09:44 UTC (rev 50)
+++ trunk/spark/test/inputtest/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
@@ -5,7 +5,11 @@
main.cpp
)
-include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
+if(WIN32)
+ include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
+else(WIN32)
+ include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
+endif(WIN32)
add_executable(inputtest ${inputtest_SRCS})
Modified: trunk/spark/test/scenetest/CMakeLists.txt
===================================================================
--- trunk/spark/test/scenetest/CMakeLists.txt 2009-02-15 12:09:44 UTC (rev 50)
+++ trunk/spark/test/scenetest/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
@@ -8,7 +8,11 @@
md5mesh_c.cpp
)
-include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
+if(WIN32)
+ include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
+else(WIN32)
+ include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
+endif(WIN32)
add_executable(scenetest ${scenetest_SRCS})
Modified: trunk/spark/utility/rcssnet/CMakeLists.txt
===================================================================
--- trunk/spark/utility/rcssnet/CMakeLists.txt 2009-02-15 12:09:44 UTC (rev 50)
+++ trunk/spark/utility/rcssnet/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
@@ -23,7 +23,11 @@
add_library(rcssnet3D SHARED ${rcssnet3D_LIB_SRCS} ${rcssnet3D_LIB_HDRS})
-target_link_libraries(rcssnet3D ${NET_LIBS})
+if(WIN32)
+ target_link_libraries(rcssnet3D ${NET_LIBS} WS2_32.lib)
+else(WIN32)
+ target_link_libraries(rcssnet3D ${NET_LIBS})
+endif(WIN32)
set_target_properties(rcssnet3D PROPERTIES VERSION ${RCSSNET_VERSION}
SOVERSION ${RCSSNET_SO_VERSION})
Added: trunk/spark/windows/include/GL/glext.h
===================================================================
--- trunk/spark/windows/include/GL/glext.h (rev 0)
+++ trunk/spark/windows/include/GL/glext.h 2009-02-17 11:53:43 UTC (rev 51)
@@ -0,0 +1,8395 @@
+#ifndef __glext_h_
+#define __glext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/*************************************************************/
+
+/* Header file version number, required by OpenGL ABI for Linux */
+/* glext.h last updated 2008/08/16 */
+/* Current version at http://www.opengl.org/registry/ */
+#define GL_GLEXT_VERSION 42
+
+#ifndef GL_VERSION_1_2
+#define GL_UNSIGNED_BYTE_3_3_2 0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
+#define GL_UNSIGNED_INT_8_8_8_8 0x8035
+#define GL_UNSIGNED_INT_10_10_10_2 0x8036
+#define GL_RESCALE_NORMAL 0x803A
+#define GL_TEXTURE_BINDING_3D 0x806A
+#define GL_PACK_SKIP_IMAGES 0x806B
+#define GL_PACK_IMAGE_HEIGHT 0x806C
+#define GL_UNPACK_SKIP_IMAGES 0x806D
+#define GL_UNPACK_IMAGE_HEIGHT 0x806E
+#define GL_TEXTURE_3D 0x806F
+#define GL_PROXY_TEXTURE_3D 0x8070
+#define GL_TEXTURE_DEPTH 0x8071
+#define GL_TEXTURE_WRAP_R 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE 0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362
+#define GL_UNSIGNED_SHORT_5_6_5 0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
+#define GL_BGR 0x80E0
+#define GL_BGRA 0x80E1
+#define GL_MAX_ELEMENTS_VERTICES 0x80E8
+#define GL_MAX_ELEMENTS_INDICES 0x80E9
+#define GL_CLAMP_TO_EDGE 0x812F
+#define GL_TEXTURE_MIN_LOD 0x813A
+#define GL_TEXTURE_MAX_LOD 0x813B
+#define GL_TEXTURE_BASE_LEVEL 0x813C
+#define GL_TEXTURE_MAX_LEVEL 0x813D
+#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8
+#define GL_SINGLE_COLOR 0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR 0x81FA
+#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE 0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
+#endif
+
+#ifndef GL_ARB_imaging
+#define GL_CONSTANT_COLOR 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
+#define GL_CONSTANT_ALPHA 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
+#define GL_BLEND_COLOR 0x8005
+#define GL_FUNC_ADD 0x8006
+#define GL_MIN 0x8007
+#define GL_MAX 0x8008
+#define GL_BLEND_EQUATION 0x8009
+#define GL_FUNC_SUBTRACT 0x800A
+#define GL_FUNC_REVERSE_SUBTRACT 0x800B
+#define GL_CONVOLUTION_1D 0x8010
+#define GL_CONVOLUTION_2D 0x8011
+#define GL_SEPARABLE_2D 0x8012
+#define GL_CONVOLUTION_BORDER_MODE 0x8013
+#define GL_CONVOLUTION_FILTER_SCALE 0x8014
+#define GL_CONVOLUTION_FILTER_BIAS 0x8015
+#define GL_REDUCE 0x8016
+#define GL_CONVOLUTION_FORMAT 0x8017
+#define GL_CONVOLUTION_WIDTH 0x8018
+#define GL_CONVOLUTION_HEIGHT 0x8019
+#define GL_MAX_CONVOLUTION_WIDTH 0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT 0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS 0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023
+#define GL_HISTOGRAM 0x8024
+#define GL_PROXY_HISTOGRAM 0x8025
+#define GL_HISTOGRAM_WIDTH 0x8026
+#define GL_HISTOGRAM_FORMAT 0x8027
+#define GL_HISTOGRAM_RED_SIZE 0x8028
+#define GL_HISTOGRAM_GREEN_SIZE 0x8029
+#define GL_HISTOGRAM_BLUE_SIZE 0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE 0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C
+#define GL_HISTOGRAM_SINK 0x802D
+#define GL_MINMAX 0x802E
+#define GL_MINMAX_FORMAT 0x802F
+#define GL_MINMAX_SINK 0x8030
+#define GL_TABLE_TOO_LARGE 0x8031
+#define GL_COLOR_MATRIX 0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB
+#define GL_COLOR_TABLE 0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2
+#define GL_PROXY_COLOR_TABLE 0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE 0x80D6
+#define GL_COLOR_TABLE_BIAS 0x80D7
+#define GL_COLOR_TABLE_FORMAT 0x80D8
+#define GL_COLOR_TABLE_WIDTH 0x80D9
+#define GL_COLOR_TABLE_RED_SIZE 0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF
+#define GL_CONSTANT_BORDER 0x8151
+#define GL_REPLICATE_BORDER 0x8153
+#define GL_CONVOLUTION_BORDER_COLOR 0x8154
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_TEXTURE0 0x84C0
+#define GL_TEXTURE1 0x84C1
+#define GL_TEXTURE2 0x84C2
+#define GL_TEXTURE3 0x84C3
+#define GL_TEXTURE4 0x84C4
+#define GL_TEXTURE5 0x84C5
+#define GL_TEXTURE6 0x84C6
+#define GL_TEXTURE7 0x84C7
+#define GL_TEXTURE8 0x84C8
+#define GL_TEXTURE9 0x84C9
+#define GL_TEXTURE10 0x84CA
+#define GL_TEXTURE11 0x84CB
+#define GL_TEXTURE12 0x84CC
+#define GL_TEXTURE13 0x84CD
+#define GL_TEXTURE14 0x84CE
+#define GL_TEXTURE15 0x84CF
+#define GL_TEXTURE16 0x84D0
+#define GL_TEXTURE17 0x84D1
+#define GL_TEXTURE18 0x84D2
+#define GL_TEXTURE19 0x84D3
+#define GL_TEXTURE20 0x84D4
+#define GL_TEXTURE21 0x84D5
+#define GL_TEXTURE22 0x84D6
+#define GL_TEXTURE23 0x84D7
+#define GL_TEXTURE24 0x84D8
+#define GL_TEXTURE25 0x84D9
+#define GL_TEXTURE26 0x84DA
+#define GL_TEXTURE27 0x84DB
+#define GL_TEXTURE28 0x84DC
+#define GL_TEXTURE29 0x84DD
+#define GL_TEXTURE30 0x84DE
+#define GL_TEXTURE31 0x84DF
+#define GL_ACTIVE_TEXTURE 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1
+#define GL_MAX_TEXTURE_UNITS 0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6
+#define GL_MULTISAMPLE 0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE 0x809F
+#define GL_SAMPLE_COVERAGE 0x80A0
+#define GL_SAMPLE_BUFFERS 0x80A8
+#define GL_SAMPLES 0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE 0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT 0x80AB
+#define GL_MULTISAMPLE_BIT 0x20000000
+#define GL_NORMAL_MAP 0x8511
+#define GL_REFLECTION_MAP 0x8512
+#define GL_TEXTURE_CUBE_MAP 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C
+#define GL_COMPRESSED_ALPHA 0x84E9
+#define GL_COMPRESSED_LUMINANCE 0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB
+#define GL_COMPRESSED_INTENSITY 0x84EC
+#define GL_COMPRESSED_RGB 0x84ED
+#define GL_COMPRESSED_RGBA 0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT 0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0
+#define GL_TEXTURE_COMPRESSED 0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
+#define GL_CLAMP_TO_BORDER 0x812D
+#define GL_COMBINE 0x8570
+#define GL_COMBINE_RGB 0x8571
+#define GL_COMBINE_ALPHA 0x8572
+#define GL_SOURCE0_RGB 0x8580
+#define GL_SOURCE1_RGB 0x8581
+#define GL_SOURCE2_RGB 0x8582
+#define GL_SOURCE0_ALPHA 0x8588
+#define GL_SOURCE1_ALPHA 0x8589
+#define GL_SOURCE2_ALPHA 0x858A
+#define GL_OPERAND0_RGB 0x8590
+#define GL_OPERAND1_RGB 0x8591
+#define GL_OPERAND2_RGB 0x8592
+#define GL_OPERAND0_ALPHA 0x8598
+#define GL_OPERAND1_ALPHA 0x8599
+#define GL_OPERAND2_ALPHA 0x859A
+#define GL_RGB_SCALE 0x8573
+#define GL_ADD_SIGNED 0x8574
+#define GL_INTERPOLATE 0x8575
+#define GL_SUBTRACT 0x84E7
+#define GL_CONSTANT 0x8576
+#define GL_PRIMARY_COLOR 0x8577
+#define GL_PREVIOUS 0x8578
+#define GL_DOT3_RGB 0x86AE
+#define GL_DOT3_RGBA 0x86AF
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_BLEND_DST_RGB 0x80C8
+#define GL_BLEND_SRC_RGB 0x80C9
+#define GL_BLEND_DST_ALPHA 0x80CA
+#define GL_BLEND_SRC_ALPHA 0x80CB
+#define GL_POINT_SIZE_MIN 0x8126
+#define GL_POINT_SIZE_MAX 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128
+#define GL_POINT_DISTANCE_ATTENUATION 0x8129
+#define GL_GENERATE_MIPMAP 0x8191
+#define GL_GENERATE_MIPMAP_HINT 0x8192
+#define GL_DEPTH_COMPONENT16 0x81A5
+#define GL_DEPTH_COMPONENT24 0x81A6
+#define GL_DEPTH_COMPONENT32 0x81A7
+#define GL_MIRRORED_REPEAT 0x8370
+#define GL_FOG_COORDINATE_SOURCE 0x8450
+#define GL_FOG_COORDINATE 0x8451
+#define GL_FRAGMENT_DEPTH 0x8452
+#define GL_CURRENT_FOG_COORDINATE 0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456
+#define GL_FOG_COORDINATE_ARRAY 0x8457
+#define GL_COLOR_SUM 0x8458
+#define GL_CURRENT_SECONDARY_COLOR 0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D
+#define GL_SECONDARY_COLOR_ARRAY 0x845E
+#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD
+#define GL_TEXTURE_FILTER_CONTROL 0x8500
+#define GL_TEXTURE_LOD_BIAS 0x8501
+#define GL_INCR_WRAP 0x8507
+#define GL_DECR_WRAP 0x8508
+#define GL_TEXTURE_DEPTH_SIZE 0x884A
+#define GL_DEPTH_TEXTURE_MODE 0x884B
+#define GL_TEXTURE_COMPARE_MODE 0x884C
+#define GL_TEXTURE_COMPARE_FUNC 0x884D
+#define GL_COMPARE_R_TO_TEXTURE 0x884E
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_BUFFER_SIZE 0x8764
+#define GL_BUFFER_USAGE 0x8765
+#define GL_QUERY_COUNTER_BITS 0x8864
+#define GL_CURRENT_QUERY 0x8865
+#define GL_QUERY_RESULT 0x8866
+#define GL_QUERY_RESULT_AVAILABLE 0x8867
+#define GL_ARRAY_BUFFER 0x8892
+#define GL_ELEMENT_ARRAY_BUFFER 0x8893
+#define GL_ARRAY_BUFFER_BINDING 0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY 0x88B8
+#define GL_WRITE_ONLY 0x88B9
+#define GL_READ_WRITE 0x88BA
+#define GL_BUFFER_ACCESS 0x88BB
+#define GL_BUFFER_MAPPED 0x88BC
+#define GL_BUFFER_MAP_POINTER 0x88BD
+#define GL_STREAM_DRAW 0x88E0
+#define GL_STREAM_READ 0x88E1
+#define GL_STREAM_COPY 0x88E2
+#define GL_STATIC_DRAW 0x88E4
+#define GL_STATIC_READ 0x88E5
+#define GL_STATIC_COPY 0x88E6
+#define GL_DYNAMIC_DRAW 0x88E8
+#define GL_DYNAMIC_READ 0x88E9
+#define GL_DYNAMIC_COPY 0x88EA
+#define GL_SAMPLES_PASSED 0x8914
+#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE
+#define GL_FOG_COORD GL_FOG_COORDINATE
+#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE
+#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE
+#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE
+#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER
+#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
+#define GL_SRC0_RGB GL_SOURCE0_RGB
+#define GL_SRC1_RGB GL_SOURCE1_RGB
+#define GL_SRC2_RGB GL_SOURCE2_RGB
+#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA
+#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA
+#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625
+#define GL_CURRENT_VERTEX_ATTRIB 0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645
+#define GL_STENCIL_BACK_FUNC 0x8800
+#define GL_STENCIL_BACK_FAIL 0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803
+#define GL_MAX_DRAW_BUFFERS 0x8824
+#define GL_DRAW_BUFFER0 0x8825
+#define GL_DRAW_BUFFER1 0x8826
+#define GL_DRAW_BUFFER2 0x8827
+#define GL_DRAW_BUFFER3 0x8828
+#define GL_DRAW_BUFFER4 0x8829
+#define GL_DRAW_BUFFER5 0x882A
+#define GL_DRAW_BUFFER6 0x882B
+#define GL_DRAW_BUFFER7 0x882C
+#define GL_DRAW_BUFFER8 0x882D
+#define GL_DRAW_BUFFER9 0x882E
+#define GL_DRAW_BUFFER10 0x882F
+#define GL_DRAW_BUFFER11 0x8830
+#define GL_DRAW_BUFFER12 0x8831
+#define GL_DRAW_BUFFER13 0x8832
+#define GL_DRAW_BUFFER14 0x8833
+#define GL_DRAW_BUFFER15 0x8834
+#define GL_BLEND_EQUATION_ALPHA 0x883D
+#define GL_POINT_SPRITE 0x8861
+#define GL_COORD_REPLACE 0x8862
+#define GL_MAX_VERTEX_ATTRIBS 0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_COORDS 0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
+#define GL_FRAGMENT_SHADER 0x8B30
+#define GL_VERTEX_SHADER 0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A
+#define GL_MAX_VARYING_FLOATS 0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE 0x8B4F
+#define GL_FLOAT_VEC2 0x8B50
+#define GL_FLOAT_VEC3 0x8B51
+#define GL_FLOAT_VEC4 0x8B52
+#define GL_INT_VEC2 0x8B53
+#define GL_INT_VEC3 0x8B54
+#define GL_INT_VEC4 0x8B55
+#define GL_BOOL 0x8B56
+#define GL_BOOL_VEC2 0x8B57
+#define GL_BOOL_VEC3 0x8B58
+#define GL_BOOL_VEC4 0x8B59
+#define GL_FLOAT_MAT2 0x8B5A
+#define GL_FLOAT_MAT3 0x8B5B
+#define GL_FLOAT_MAT4 0x8B5C
+#define GL_SAMPLER_1D 0x8B5D
+#define GL_SAMPLER_2D 0x8B5E
+#define GL_SAMPLER_3D 0x8B5F
+#define GL_SAMPLER_CUBE 0x8B60
+#define GL_SAMPLER_1D_SHADOW 0x8B61
+#define GL_SAMPLER_2D_SHADOW 0x8B62
+#define GL_DELETE_STATUS 0x8B80
+#define GL_COMPILE_STATUS 0x8B81
+#define GL_LINK_STATUS 0x8B82
+#define GL_VALIDATE_STATUS 0x8B83
+#define GL_INFO_LOG_LENGTH 0x8B84
+#define GL_ATTACHED_SHADERS 0x8B85
+#define GL_ACTIVE_UNIFORMS 0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
+#define GL_SHADER_SOURCE_LENGTH 0x8B88
+#define GL_ACTIVE_ATTRIBUTES 0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION 0x8B8C
+#define GL_CURRENT_PROGRAM 0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0
+#define GL_LOWER_LEFT 0x8CA1
+#define GL_UPPER_LEFT 0x8CA2
+#define GL_STENCIL_BACK_REF 0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK 0x8CA5
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
+#define GL_PIXEL_PACK_BUFFER 0x88EB
+#define GL_PIXEL_UNPACK_BUFFER 0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF
+#define GL_FLOAT_MAT2x3 0x8B65
+#define GL_FLOAT_MAT2x4 0x8B66
+#define GL_FLOAT_MAT3x2 0x8B67
+#define GL_FLOAT_MAT3x4 0x8B68
+#define GL_FLOAT_MAT4x2 0x8B69
+#define GL_FLOAT_MAT4x3 0x8B6A
+#define GL_SRGB 0x8C40
+#define GL_SRGB8 0x8C41
+#define GL_SRGB_ALPHA 0x8C42
+#define GL_SRGB8_ALPHA8 0x8C43
+#define GL_SLUMINANCE_ALPHA 0x8C44
+#define GL_SLUMINANCE8_ALPHA8 0x8C45
+#define GL_SLUMINANCE 0x8C46
+#define GL_SLUMINANCE8 0x8C47
+#define GL_COMPRESSED_SRGB 0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA 0x8C49
+#define GL_COMPRESSED_SLUMINANCE 0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B
+#endif
+
+#ifndef GL_VERSION_3_0
+#define GL_COMPARE_REF_TO_TEXTURE GL_COMPARE_R_TO_TEXTURE_ARB
+#define GL_CLIP_DISTANCE0 GL_CLIP_PLANE0
+#define GL_CLIP_DISTANCE1 GL_CLIP_PLANE1
+#define GL_CLIP_DISTANCE2 GL_CLIP_PLANE2
+#define GL_CLIP_DISTANCE3 GL_CLIP_PLANE3
+#define GL_CLIP_DISTANCE4 GL_CLIP_PLANE4
+#define GL_CLIP_DISTANCE5 GL_CLIP_PLANE5
+#define GL_MAX_CLIP_DISTANCES GL_MAX_CLIP_PLANES
+#define GL_MAJOR_VERSION 0x821B
+#define GL_MINOR_VERSION 0x821C
+#define GL_NUM_EXTENSIONS 0x821D
+#define GL_CONTEXT_FLAGS 0x821E
+#define GL_DEPTH_BUFFER 0x8223
+#define GL_STENCIL_BUFFER 0x8224
+#define GL_COMPRESSED_RED 0x8225
+#define GL_COMPRESSED_RG 0x8226
+#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
+#define GL_RGBA32F 0x8814
+#define GL_RGB32F 0x8815
+#define GL_RGBA16F 0x881A
+#define GL_RGB16F 0x881B
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD
+#define GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF
+#define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905
+#define GL_CLAMP_VERTEX_COLOR 0x891A
+#define GL_CLAMP_FRAGMENT_COLOR 0x891B
+#define GL_CLAMP_READ_COLOR 0x891C
+#define GL_FIXED_ONLY 0x891D
+#define GL_MAX_VARYING_COMPONENTS GL_MAX_VARYING_FLOATS
+#define GL_TEXTURE_RED_TYPE 0x8C10
+#define GL_TEXTURE_GREEN_TYPE 0x8C11
+#define GL_TEXTURE_BLUE_TYPE 0x8C12
+#define GL_TEXTURE_ALPHA_TYPE 0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE 0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE 0x8C15
+#define GL_TEXTURE_DEPTH_TYPE 0x8C16
+#define GL_UNSIGNED_NORMALIZED 0x8C17
+#define GL_TEXTURE_1D_ARRAY 0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY 0x8C19
+#define GL_TEXTURE_2D_ARRAY 0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY 0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY 0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY 0x8C1D
+#define GL_R11F_G11F_B10F 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B
+#define GL_RGB9_E5 0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E
+#define GL_TEXTURE_SHARED_SIZE 0x8C3F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
+#define GL_PRIMITIVES_GENERATED 0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
+#define GL_RASTERIZER_DISCARD 0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS 0x8C8C
+#define GL_SEPARATE_ATTRIBS 0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
+#define GL_RGBA32UI 0x8D70
+#define GL_RGB32UI 0x8D71
+#define GL_RGBA16UI 0x8D76
+#define GL_RGB16UI 0x8D77
+#define GL_RGBA8UI 0x8D7C
+#define GL_RGB8UI 0x8D7D
+#define GL_RGBA32I 0x8D82
+#define GL_RGB32I 0x8D83
+#define GL_RGBA16I 0x8D88
+#define GL_RGB16I 0x8D89
+#define GL_RGBA8I 0x8D8E
+#define GL_RGB8I 0x8D8F
+#define GL_RED_INTEGER 0x8D94
+#define GL_GREEN_INTEGER 0x8D95
+#define GL_BLUE_INTEGER 0x8D96
+#define GL_ALPHA_INTEGER 0x8D97
+#define GL_RGB_INTEGER 0x8D98
+#define GL_RGBA_INTEGER 0x8D99
+#define GL_BGR_INTEGER 0x8D9A
+#define GL_BGRA_INTEGER 0x8D9B
+#define GL_SAMPLER_1D_ARRAY 0x8DC0
+#define GL_SAMPLER_2D_ARRAY 0x8DC1
+#define GL_SAMPLER_1D_ARRAY_SHADOW 0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW 0x8DC5
+#define GL_UNSIGNED_INT_VEC2 0x8DC6
+#define GL_UNSIGNED_INT_VEC3 0x8DC7
+#define GL_UNSIGNED_INT_VEC4 0x8DC8
+#define GL_INT_SAMPLER_1D 0x8DC9
+#define GL_INT_SAMPLER_2D 0x8DCA
+#define GL_INT_SAMPLER_3D 0x8DCB
+#define GL_INT_SAMPLER_CUBE 0x8DCC
+#define GL_INT_SAMPLER_1D_ARRAY 0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY 0x8DCF
+#define GL_UNSIGNED_INT_SAMPLER_1D 0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY 0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY 0x8DD7
+#define GL_QUERY_WAIT 0x8E13
+#define GL_QUERY_NO_WAIT 0x8E14
+#define GL_QUERY_BY_REGION_WAIT 0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT 0x8E16
+/* Reuse tokens from ARB_depth_buffer_float */
+/* reuse GL_DEPTH_COMPONENT32F */
+/* reuse GL_DEPTH32F_STENCIL8 */
+/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
+/* Reuse tokens from ARB_framebuffer_object */
+/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_DEFAULT */
+/* reuse GL_FRAMEBUFFER_UNDEFINED */
+/* reuse GL_DEPTH_STENCIL_ATTACHMENT */
+/* reuse GL_INDEX */
+/* reuse GL_MAX_RENDERBUFFER_SIZE */
+/* reuse GL_DEPTH_STENCIL */
+/* reuse GL_UNSIGNED_INT_24_8 */
+/* reuse GL_DEPTH24_STENCIL8 */
+/* reuse GL_TEXTURE_STENCIL_SIZE */
+/* reuse GL_TEXTURE_RED_TYPE */
+/* reuse GL_TEXTURE_GREEN_TYPE */
+/* reuse GL_TEXTURE_BLUE_TYPE */
+/* reuse GL_TEXTURE_ALPHA_TYPE */
+/* reuse GL_TEXTURE_LUMINANCE_TYPE */
+/* reuse GL_TEXTURE_INTENSITY_TYPE */
+/* reuse GL_TEXTURE_DEPTH_TYPE */
+/* reuse GL_UNSIGNED_NORMALIZED */
+/* reuse GL_FRAMEBUFFER_BINDING */
+/* reuse GL_DRAW_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_BINDING */
+/* reuse GL_READ_FRAMEBUFFER */
+/* reuse GL_DRAW_FRAMEBUFFER */
+/* reuse GL_READ_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_SAMPLES */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+/* reuse GL_FRAMEBUFFER_COMPLETE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+/* reuse GL_FRAMEBUFFER_UNSUPPORTED */
+/* reuse GL_MAX_COLOR_ATTACHMENTS */
+/* reuse GL_COLOR_ATTACHMENT0 */
+/* reuse GL_COLOR_ATTACHMENT1 */
+/* reuse GL_COLOR_ATTACHMENT2 */
+/* reuse GL_COLOR_ATTACHMENT3 */
+/* reuse GL_COLOR_ATTACHMENT4 */
+/* reuse GL_COLOR_ATTACHMENT5 */
+/* reuse GL_COLOR_ATTACHMENT6 */
+/* reuse GL_COLOR_ATTACHMENT7 */
+/* reuse GL_COLOR_ATTACHMENT8 */
+/* reuse GL_COLOR_ATTACHMENT9 */
+/* reuse GL_COLOR_ATTACHMENT10 */
+/* reuse GL_COLOR_ATTACHMENT11 */
+/* reuse GL_COLOR_ATTACHMENT12 */
+/* reuse GL_COLOR_ATTACHMENT13 */
+/* reuse GL_COLOR_ATTACHMENT14 */
+/* reuse GL_COLOR_ATTACHMENT15 */
+/* reuse GL_DEPTH_ATTACHMENT */
+/* reuse GL_STENCIL_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER */
+/* reuse GL_RENDERBUFFER */
+/* reuse GL_RENDERBUFFER_WIDTH */
+/* reuse GL_RENDERBUFFER_HEIGHT */
+/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */
+/* reuse GL_STENCIL_INDEX1 */
+/* reuse GL_STENCIL_INDEX4 */
+/* reuse GL_STENCIL_INDEX8 */
+/* reuse GL_STENCIL_INDEX16 */
+/* reuse GL_RENDERBUFFER_RED_SIZE */
+/* reuse GL_RENDERBUFFER_GREEN_SIZE */
+/* reuse GL_RENDERBUFFER_BLUE_SIZE */
+/* reuse GL_RENDERBUFFER_ALPHA_SIZE */
+/* reuse GL_RENDERBUFFER_DEPTH_SIZE */
+/* reuse GL_RENDERBUFFER_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+/* reuse GL_MAX_SAMPLES */
+/* Reuse tokens from ARB_framebuffer_sRGB */
+/* reuse GL_FRAMEBUFFER_SRGB */
+/* Reuse tokens from ARB_half_float_vertex */
+/* reuse GL_HALF_FLOAT */
+/* Reuse tokens from ARB_map_buffer_range */
+/* reuse GL_MAP_READ_BIT */
+/* reuse GL_MAP_WRITE_BIT */
+/* reuse GL_MAP_INVALIDATE_RANGE_BIT */
+/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */
+/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */
+/* reuse GL_MAP_UNSYNCHRONIZED_BIT */
+/* Reuse tokens from ARB_texture_compression_rgtc */
+/* reuse GL_COMPRESSED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_RG_RGTC2 */
+/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */
+/* Reuse tokens from ARB_texture_rg */
+/* reuse GL_RG */
+/* reuse GL_RG_INTEGER */
+/* reuse GL_R8 */
+/* reuse GL_R16 */
+/* reuse GL_RG8 */
+/* reuse GL_RG16 */
+/* reuse GL_R16F */
+/* reuse GL_R32F */
+/* reuse GL_RG16F */
+/* reuse GL_RG32F */
+/* reuse GL_R8I */
+/* reuse GL_R8UI */
+/* reuse GL_R16I */
+/* reuse GL_R16UI */
+/* reuse GL_R32I */
+/* reuse GL_R32UI */
+/* reuse GL_RG8I */
+/* reuse GL_RG8UI */
+/* reuse GL_RG16I */
+/* reuse GL_RG16UI */
+/* reuse GL_RG32I */
+/* reuse GL_RG32UI */
+/* Reuse tokens from ARB_vertex_array_object */
+/* reuse GL_VERTEX_ARRAY_BINDING */
+#endif
+
+#ifndef GL_ARB_multitexture
+#define GL_TEXTURE0_ARB 0x84C0
+#define GL_TEXTURE1_ARB 0x84C1
+#define GL_TEXTURE2_ARB 0x84C2
+#define GL_TEXTURE3_ARB 0x84C3
+#define GL_TEXTURE4_ARB 0x84C4
+#define GL_TEXTURE5_ARB 0x84C5
+#define GL_TEXTURE6_ARB 0x84C6
+#define GL_TEXTURE7_ARB 0x84C7
+#define GL_TEXTURE8_ARB 0x84C8
+#define GL_TEXTURE9_ARB 0x84C9
+#define GL_TEXTURE10_ARB 0x84CA
+#define GL_TEXTURE11_ARB 0x84CB
+#define GL_TEXTURE12_ARB 0x84CC
+#define GL_TEXTURE13_ARB 0x84CD
+#define GL_TEXTURE14_ARB 0x84CE
+#define GL_TEXTURE15_ARB 0x84CF
+#define GL_TEXTURE16_ARB 0x84D0
+#define GL_TEXTURE17_ARB 0x84D1
+#define GL_TEXTURE18_ARB 0x84D2
+#define GL_TEXTURE19_ARB 0x84D3
+#define GL_TEXTURE20_ARB 0x84D4
+#define GL_TEXTURE21_ARB 0x84D5
+#define GL_TEXTURE22_ARB 0x84D6
+#define GL_TEXTURE23_ARB 0x84D7
+#define GL_TEXTURE24_ARB 0x84D8
+#define GL_TEXTURE25_ARB 0x84D9
+#define GL_TEXTURE26_ARB 0x84DA
+#define GL_TEXTURE27_ARB 0x84DB
+#define GL_TEXTURE28_ARB 0x84DC
+#define GL_TEXTURE29_ARB 0x84DD
+#define GL_TEXTURE30_ARB 0x84DE
+#define GL_TEXTURE31_ARB 0x84DF
+#define GL_ACTIVE_TEXTURE_ARB 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6
+#endif
+
+#ifndef GL_ARB_multisample
+#define GL_MULTISAMPLE_ARB 0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F
+#define GL_SAMPLE_COVERAGE_ARB 0x80A0
+#define GL_SAMPLE_BUFFERS_ARB 0x80A8
+#define GL_SAMPLES_ARB 0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB
+#define GL_MULTISAMPLE_BIT_ARB 0x20000000
+#endif
+
+#ifndef GL_ARB_texture_env_add
+#endif
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_NORMAL_MAP_ARB 0x8511
+#define GL_REFLECTION_MAP_ARB 0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C
+#endif
+
+#ifndef GL_ARB_texture_compression
+#define GL_COMPRESSED_ALPHA_ARB 0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB 0x84EC
+#define GL_COMPRESSED_RGB_ARB 0x84ED
+#define GL_COMPRESSED_RGBA_ARB 0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB 0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+#endif
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_ARB 0x812D
+#endif
+
+#ifndef GL_ARB_point_parameters
+#define GL_POINT_SIZE_MIN_ARB 0x8126
+#define GL_POINT_SIZE_MAX_ARB 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+#endif
+
+#ifndef GL_ARB_vertex_blend
+#define GL_MAX_VERTEX_UNITS_ARB 0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6
+#define GL_VERTEX_BLEND_ARB 0x86A7
+#define GL_CURRENT_WEIGHT_ARB 0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC
+#define GL_WEIGHT_ARRAY_ARB 0x86AD
+#define GL_MODELVIEW0_ARB 0x1700
+#define GL_MODELVIEW1_ARB 0x850A
+#define GL_MODELVIEW2_ARB 0x8722
+#define GL_MODELVIEW3_ARB 0x8723
+#define GL_MODELVIEW4_ARB 0x8724
+#define GL_MODELVIEW5_ARB 0x8725
+#define GL_MODELVIEW6_ARB 0x8726
+#define GL_MODELVIEW7_ARB 0x8727
+#define GL_MODELVIEW8_ARB 0x8728
+#define GL_MODELVIEW9_ARB 0x8729
+#define GL_MODELVIEW10_ARB 0x872A
+#define GL_MODELVIEW11_ARB 0x872B
+#define GL_MODELVIEW12_ARB 0x872C
+#define GL_MODELVIEW13_ARB 0x872D
+#define GL_MODELVIEW14_ARB 0x872E
+#define GL_MODELVIEW15_ARB 0x872F
+#define GL_MODELVIEW16_ARB 0x8730
+#define GL_MODELVIEW17_ARB 0x8731
+#define GL_MODELVIEW18_ARB 0x8732
+#define GL_MODELVIEW19_ARB 0x8733
+#define GL_MODELVIEW20_ARB 0x8734
+#define GL_MODELVIEW21_ARB 0x8735
+#define GL_MODELVIEW22_ARB 0x8736
+#define GL_MODELVIEW23_ARB 0x8737
+#define GL_MODELVIEW24_ARB 0x8738
+#define GL_MODELVIEW25_ARB 0x8739
+#define GL_MODELVIEW26_ARB 0x873A
+#define GL_MODELVIEW27_ARB 0x873B
+#define GL_MODELVIEW28_ARB 0x873C
+#define GL_MODELVIEW29_ARB 0x873D
+#define GL_MODELVIEW30_ARB 0x873E
+#define GL_MODELVIEW31_ARB 0x873F
+#endif
+
+#ifndef GL_ARB_matrix_palette
+#define GL_MATRIX_PALETTE_ARB 0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB 0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+#endif
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_COMBINE_ARB 0x8570
+#define GL_COMBINE_RGB_ARB 0x8571
+#define GL_COMBINE_ALPHA_ARB 0x8572
+#define GL_SOURCE0_RGB_ARB 0x8580
+#define GL_SOURCE1_RGB_ARB 0x8581
+#define GL_SOURCE2_RGB_ARB 0x8582
+#define GL_SOURCE0_ALPHA_ARB 0x8588
+#define GL_SOURCE1_ALPHA_ARB 0x8589
+#define GL_SOURCE2_ALPHA_ARB 0x858A
+#define GL_OPERAND0_RGB_ARB 0x8590
+#define GL_OPERAND1_RGB_ARB 0x8591
+#define GL_OPERAND2_RGB_ARB 0x8592
+#define GL_OPERAND0_ALPHA_ARB 0x8598
+#define GL_OPERAND1_ALPHA_ARB 0x8599
+#define GL_OPERAND2_ALPHA_ARB 0x859A
+#define GL_RGB_SCALE_ARB 0x8573
+#define GL_ADD_SIGNED_ARB 0x8574
+#define GL_INTERPOLATE_ARB 0x8575
+#define GL_SUBTRACT_ARB 0x84E7
+#define GL_CONSTANT_ARB 0x8576
+#define GL_PRIMARY_COLOR_ARB 0x8577
+#define GL_PREVIOUS_ARB 0x8578
+#endif
+
+#ifndef GL_ARB_texture_env_crossbar
+#endif
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_DOT3_RGB_ARB 0x86AE
+#define GL_DOT3_RGBA_ARB 0x86AF
+#endif
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_ARB 0x8370
+#endif
+
+#ifndef GL_ARB_depth_texture
+#define GL_DEPTH_COMPONENT16_ARB 0x81A5
+#define GL_DEPTH_COMPONENT24_ARB 0x81A6
+#define GL_DEPTH_COMPONENT32_ARB 0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A
+#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B
+#endif
+
+#ifndef GL_ARB_shadow
+#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C
+#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D
+#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E
+#endif
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
+#endif
+
+#ifndef GL_ARB_window_pos
+#endif
+
+#ifndef GL_ARB_vertex_program
+#define GL_COLOR_SUM_ARB 0x8458
+#define GL_VERTEX_PROGRAM_ARB 0x8620
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB 0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB 0x8625
+#define GL_CURRENT_VERTEX_ATTRIB_ARB 0x8626
+#define GL_PROGRAM_LENGTH_ARB 0x8627
+#define GL_PROGRAM_STRING_ARB 0x8628
+#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
+#define GL_MAX_PROGRAM_MATRICES_ARB 0x862F
+#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
+#define GL_CURRENT_MATRIX_ARB 0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB 0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB 0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
+#define GL_PROGRAM_ERROR_POSITION_ARB 0x864B
+#define GL_PROGRAM_BINDING_ARB 0x8677
+#define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
+#define GL_PROGRAM_ERROR_STRING_ARB 0x8874
+#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875
+#define GL_PROGRAM_FORMAT_ARB 0x8876
+#define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0
+#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB 0x88A1
+#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
+#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
+#define GL_PROGRAM_TEMPORARIES_ARB 0x88A4
+#define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5
+#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
+#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
+#define GL_PROGRAM_PARAMETERS_ARB 0x88A8
+#define GL_MAX_PROGRAM_PARAMETERS_ARB 0x88A9
+#define GL_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AA
+#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
+#define GL_PROGRAM_ATTRIBS_ARB 0x88AC
+#define GL_MAX_PROGRAM_ATTRIBS_ARB 0x88AD
+#define GL_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AE
+#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
+#define GL_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B0
+#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
+#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
+#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
+#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
+#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
+#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
+#define GL_TRANSPOSE_CURRENT_MATRIX_ARB 0x88B7
+#define GL_MATRIX0_ARB 0x88C0
+#define GL_MATRIX1_ARB 0x88C1
+#define GL_MATRIX2_ARB 0x88C2
+#define GL_MATRIX3_ARB 0x88C3
+#define GL_MATRIX4_ARB 0x88C4
+#define GL_MATRIX5_ARB 0x88C5
+#define GL_MATRIX6_ARB 0x88C6
+#define GL_MATRIX7_ARB 0x88C7
+#define GL_MATRIX8_ARB 0x88C8
+#define GL_MATRIX9_ARB 0x88C9
+#define GL_MATRIX10_ARB 0x88CA
+#define GL_MATRIX11_ARB 0x88CB
+#define GL_MATRIX12_ARB 0x88CC
+#define GL_MATRIX13_ARB 0x88CD
+#define GL_MATRIX14_ARB 0x88CE
+#define GL_MATRIX15_ARB 0x88CF
+#define GL_MATRIX16_ARB 0x88D0
+#define GL_MATRIX17_ARB 0x88D1
+#define GL_MATRIX18_ARB 0x88D2
+#define GL_MATRIX19_ARB 0x88D3
+#define GL_MATRIX20_ARB 0x88D4
+#define GL_MATRIX21_ARB 0x88D5
+#define GL_MATRIX22_ARB 0x88D6
+#define GL_MATRIX23_ARB 0x88D7
+#define GL_MATRIX24_ARB 0x88D8
+#define GL_MATRIX25_ARB 0x88D9
+#define GL_MATRIX26_ARB 0x88DA
+#define GL_MATRIX27_ARB 0x88DB
+#define GL_MATRIX28_ARB 0x88DC
+#define GL_MATRIX29_ARB 0x88DD
+#define GL_MATRIX30_ARB 0x88DE
+#define GL_MATRIX31_ARB 0x88DF
+#endif
+
+#ifndef GL_ARB_fragment_program
+#define GL_FRAGMENT_PROGRAM_ARB 0x8804
+#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805
+#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB 0x8806
+#define GL_PROGRAM_TEX_INDIRECTIONS_ARB 0x8807
+#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
+#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
+#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
+#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
+#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
+#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
+#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
+#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
+#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
+#define GL_MAX_TEXTURE_COORDS_ARB 0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB 0x8872
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_BUFFER_SIZE_ARB 0x8764
+#define GL_BUFFER_USAGE_ARB 0x8765
+#define GL_ARRAY_BUFFER_ARB 0x8892
+#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893
+#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
+#define GL_READ_ONLY_ARB 0x88B8
+#define GL_WRITE_ONLY_ARB 0x88B9
+#define GL_READ_WRITE_ARB 0x88BA
+#define GL_BUFFER_ACCESS_ARB 0x88BB
+#define GL_BUFFER_MAPPED_ARB 0x88BC
+#define GL_BUFFER_MAP_POINTER_ARB 0x88BD
+#define GL_STREAM_DRAW_ARB 0x88E0
+#define GL_STREAM_READ_ARB 0x88E1
+#define GL_STREAM_COPY_ARB 0x88E2
+#define GL_STATIC_DRAW_ARB 0x88E4
+#define GL_STATIC_READ_ARB 0x88E5
+#define GL_STATIC_COPY_ARB 0x88E6
+#define GL_DYNAMIC_DRAW_ARB 0x88E8
+#define GL_DYNAMIC_READ_ARB 0x88E9
+#define GL_DYNAMIC_COPY_ARB 0x88EA
+#endif
+
+#ifndef GL_ARB_occlusion_query
+#define GL_QUERY_COUNTER_BITS_ARB 0x8864
+#define GL_CURRENT_QUERY_ARB 0x8865
+#define GL_QUERY_RESULT_ARB 0x8866
+#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867
+#define GL_SAMPLES_PASSED_ARB 0x8914
+#endif
+
+#ifndef GL_ARB_shader_objects
+#define GL_PROGRAM_OBJECT_ARB 0x8B40
+#define GL_SHADER_OBJECT_ARB 0x8B48
+#define GL_OBJECT_TYPE_ARB 0x8B4E
+#define GL_OBJECT_SUBTYPE_ARB 0x8B4F
+#define GL_FLOAT_VEC2_ARB 0x8B50
+#define GL_FLOAT_VEC3_ARB 0x8B51
+#define GL_FLOAT_VEC4_ARB 0x8B52
+#define GL_INT_VEC2_ARB 0x8B53
+#define GL_INT_VEC3_ARB 0x8B54
+#define GL_INT_VEC4_ARB 0x8B55
+#define GL_BOOL_ARB 0x8B56
+#define GL_BOOL_VEC2_ARB 0x8B57
+#define GL_BOOL_VEC3_ARB 0x8B58
+#define GL_BOOL_VEC4_ARB 0x8B59
+#define GL_FLOAT_MAT2_ARB 0x8B5A
+#define GL_FLOAT_MAT3_ARB 0x8B5B
+#define GL_FLOAT_MAT4_ARB 0x8B5C
+#define GL_SAMPLER_1D_ARB 0x8B5D
+#define GL_SAMPLER_2D_ARB 0x8B5E
+#define GL_SAMPLER_3D_ARB 0x8B5F
+#define GL_SAMPLER_CUBE_ARB 0x8B60
+#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61
+#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62
+#define GL_SAMPLER_2D_RECT_ARB 0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64
+#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80
+#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB 0x8B82
+#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84
+#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85
+#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86
+#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
+#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
+#endif
+
+#ifndef GL_ARB_vertex_shader
+#define GL_VERTEX_SHADER_ARB 0x8B31
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
+#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
+#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89
+#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
+#endif
+
+#ifndef GL_ARB_fragment_shader
+#define GL_FRAGMENT_SHADER_ARB 0x8B30
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
+#endif
+
+#ifndef GL_ARB_shading_language_100
+#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C
+#endif
+
+#ifndef GL_ARB_texture_non_power_of_two
+#endif
+
+#ifndef GL_ARB_point_sprite
+#define GL_POINT_SPRITE_ARB 0x8861
+#define GL_COORD_REPLACE_A...
[truncated message content] |
|
From: <mar...@us...> - 2009-02-15 12:09:51
|
Revision: 50
http://simspark.svn.sourceforge.net/simspark/?rev=50&view=rev
Author: marianbuchta
Date: 2009-02-15 12:09:44 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
-add new version of FindBoost.cmake (from CMake 2.7.20090210),which fixed boost library path issue in Windows
-add FindZLIB.cmake
-fixed finding SDL library path
-change include path for SDL header files
-fixed fatal error C1021, because VS don't recognize warning macro
Modified Paths:
--------------
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/cmake/FindBoost.cmake
trunk/spark/cmake/FindSDL.cmake
trunk/spark/lib/zeitgeist/CMakeLists.txt
trunk/spark/plugin/imageperceptor/imageperceptor.cpp
trunk/spark/plugin/inputsdl/inputdevicesdl.h
trunk/spark/plugin/inputsdl/inputsystemsdl.cpp
trunk/spark/plugin/inputsdl/inputsystemsdl.h
trunk/spark/plugin/openglsyssdl/openglsystemsdl.cpp
trunk/spark/test/fonttest/main.cpp
trunk/spark/test/inputtest/main.cpp
trunk/spark/test/scenetest/main.cpp
trunk/spark/test/scenetest/md5mesh.cpp
Added Paths:
-----------
trunk/spark/cmake/FindZLIB.cmake
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-02-12 08:15:05 UTC (rev 49)
+++ trunk/spark/CMakeLists.txt 2009-02-15 12:09:44 UTC (rev 50)
@@ -25,6 +25,10 @@
HAVE_COREFOUNDATION_COREFOUNDATION_H)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
+if(WIN32)
+ find_package(zlib REQUIRED)
+ set(Boost_USE_STATIC_LIBS ON)
+endif(WIN32)
find_package(Ruby REQUIRED)
find_package(Freetype REQUIRED)
find_package(DevIL REQUIRED)
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-02-12 08:15:05 UTC (rev 49)
+++ trunk/spark/ChangeLog 2009-02-15 12:09:44 UTC (rev 50)
@@ -1,3 +1,36 @@
+2009-02-15 Marian Buchta <mar...@gm...>
+
+ * CMakeLists.txt
+ - add macro for finding boost static library (Windows platform)
+ - add macro for finding zlib library
+
+ * cmake/FindBoost.cmake
+ - add new version of findboost from cmake2.7,which fixed boost library path issue in Windows (find 2 components but add path only one of them)
+
+ * cmake/FindSDL.cmake
+ - fixed library path
+
+ * cmake/FindZLIB.cmake
+ - add macro for finding ZLIB library
+
+ * lib/zeitgeist/CMakeLists.txt
+ - fixed missing correct extension (from #telnetserver/telnetsession.c to #telnetserver/telnetsession.cpp)
+
+ * plugin/imageperceptor/imageperceptor.cpp
+ - add include files only for Windows platform
+
+ * plugin/inputsdl/inputdevicesdl.h
+ * plugin/inputsdl/inputsystemsdl.cpp
+ * plugin/inputsdl/inputsystemsdl.h
+ * plugin/openglsyssdl/openglsystemsdl.cpp
+ * test/fonttest/main.cpp
+ * test/inputtest/main.cpp
+ * test/scenetest/main.cpp
+ - change include path for SDL header files because of FindSDL.cmake script
+
+ * test/scenetest/md5mesh.cpp
+ - fixed fatal error C1021 - invalid preprocessor command (Windows platform)
+
2009-01-29 Hedayat Vatankhah <he...@gr...>
* README:
Modified: trunk/spark/cmake/FindBoost.cmake
===================================================================
--- trunk/spark/cmake/FindBoost.cmake 2009-02-12 08:15:05 UTC (rev 49)
+++ trunk/spark/cmake/FindBoost.cmake 2009-02-15 12:09:44 UTC (rev 50)
@@ -1,78 +1,145 @@
# - Try to find Boost include dirs and libraries
# Usage of this module as follows:
#
-# SET(Boost_USE_STATIC_LIBS ON)
-# SET(Boost_USE_MULTITHREAD OFF)
-# FIND_PACKAGE( Boost 1.34.1 COMPONENTS date_time filesystem iostreams ... )
+# == Using Header-Only libraries from within Boost: ==
#
-# The Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
-# boost version numbers that should be taken into account when searching
-# for the libraries. Unfortunately boost puts the version number into the
-# actual filename for the libraries, so this might be needed in the future
-# when new Boost versions are released.
+# find_package( Boost 1.36.0 )
+# if(Boost_FOUND)
+# include_directories(${Boost_INCLUDE_DIRS})
+# add_executable(foo foo.cc)
+# endif()
#
-# Currently this module searches for the following version numbers:
-# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1, 1.36,
-# 1.36.0, 1.36.1
#
-# The components list needs to be the actual names of boost libraries, that is
-# the part of the actual library files that differ on different libraries. So
-# its "date_time" for "libboost_date_time...". Anything else will result in
-# errors
+# == Using actual libraries from within Boost: ==
#
-# You can provide a minimum version number that should be used. If you provide this
+# set(Boost_USE_STATIC_LIBS ON)
+# set(Boost_USE_MULTITHREADED ON)
+# find_package( Boost 1.36.0 COMPONENTS date_time filesystem system ... )
+#
+# if(Boost_FOUND)
+# include_directories(${Boost_INCLUDE_DIRS})
+# add_executable(foo foo.cc)
+# target_link_libraries(foo ${Boost_LIBRARIES})
+# endif()
+#
+#
+# The components list needs to contain actual names of boost libraries only,
+# such as "date_time" for "libboost_date_time". If you're using parts of
+# Boost that contain header files only (e.g. foreach) you do not need to
+# specify COMPONENTS.
+#
+# You should provide a minimum version number that should be used. If you provide this
# version number and specify the REQUIRED attribute, this module will fail if it
# can't find the specified or a later version. If you specify a version number this is
# automatically put into the considered list of version numbers and thus doesn't need
-# to be specified in the Boost_ADDITIONAL_VERSIONS variable
+# to be specified in the Boost_ADDITIONAL_VERSIONS variable (see below).
#
+# NOTE for Visual Studio Users:
+# Automatic linking is used on MSVC & Borland compilers by default when
+# #including things in Boost. It's important to note that setting
+# Boost_USE_STATIC_LIBS to OFF is NOT enough to get you dynamic linking,
+# should you need this feature. Automatic linking typically uses static
+# libraries with a few exceptions (Boost.Python is one).
+#
+# Please see the section below near Boost_LIB_DIAGNOSTIC_DEFINITIONS for
+# more details. Adding a TARGET_LINK_LIBRARIES() as shown in the example
+# above appears to cause VS to link dynamically if Boost_USE_STATIC_LIBS
+# gets set to OFF. It is suggested you avoid automatic linking since it
+# will make your application less portable.
+#
+# =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============
+#
+# OK, so the Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
+# boost version numbers that should be taken into account when searching
+# for Boost. Unfortunately boost puts the version number into the
+# actual filename for the libraries, so this variable will certainly be needed
+# in the future when new Boost versions are released.
+#
+# Currently this module searches for the following version numbers:
+# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
+# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0
+#
+# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
+# add both 1.x and 1.x.0 as shown above. Official Boost include directories
+# omit the 3rd version number from include paths if it is 0 although not all
+# binary Boost releases do so.
+#
+# SET(Boost_ADDITIONAL_VERSIONS "0.99" "0.99.0" "1.78" "1.78.0")
+#
+# ============================================================================
+#
# Variables used by this module, they can change the default behaviour and need to be set
# before calling find_package:
-# Boost_USE_MULTITHREAD Can be set to OFF to use the non-multithreaded
-# boost libraries. Defaults to ON.
+#
+# Boost_USE_MULTITHREADED Can be set to OFF to use the non-multithreaded
+# boost libraries. If not specified, defaults
+# to ON.
+#
# Boost_USE_STATIC_LIBS Can be set to ON to force the use of the static
# boost libraries. Defaults to OFF.
+#
+# Other Variables used by this module which you may want to set.
+#
# Boost_ADDITIONAL_VERSIONS A list of version numbers to use for searching
-# the boost include directory. The default list
-# of version numbers is:
-# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1,
-# 1.35, 1.35.0, 1.35.1, 1.36, 1.36.0, 1.36.1
-# If you want to look for an older or newer
-# version set this variable to a list of
-# strings, where each string contains a number, i.e.
-# SET(Boost_ADDITIONAL_VERSIONS "0.99.0" "1.35.0")
-# BOOST_ROOT or BOOSTROOT Preferred installation prefix for searching for Boost,
-# set this if the module has problems finding the proper Boost installation
+# the boost include directory. Please see
+# the documentation above regarding this
+# annoying, but necessary variable :(
+#
+# Boost_DEBUG Set this to TRUE to enable debugging output
+# of FindBoost.cmake if you are having problems.
+# Please enable this before filing any bug
+# reports.
+#
+# Boost_COMPILER Set this to the compiler suffix used by Boost
+# (e.g. "-gcc43") if FindBoods has problems finding
+# the proper Boost installation
+#
+# These last three variables are available also as environment variables:
+#
+# BOOST_ROOT or BOOSTROOT The preferred installation prefix for searching for
+# Boost. Set this if the module has problems finding
+# the proper Boost installation.
+#
# BOOST_INCLUDEDIR Set this to the include directory of Boost, if the
# module has problems finding the proper Boost installation
+#
# BOOST_LIBRARYDIR Set this to the lib directory of Boost, if the
# module has problems finding the proper Boost installation
#
-# The last three variables are available also as environment variables
+# Variables defined by this module:
#
+# Boost_FOUND System has Boost, this means the include dir was
+# found, as well as all the libraries specified in
+# the COMPONENTS list.
#
-# Variables defined by this module:
+# Boost_INCLUDE_DIRS Boost include directories: not cached
#
-# Boost_FOUND System has Boost, this means the include dir was found,
-# as well as all the libraries specified in the COMPONENTS list
-# Boost_INCLUDE_DIRS Boost include directories, not cached
-# Boost_INCLUDE_DIR This is almost the same as above, but this one is cached and may be
-# modified by advanced users
-# Boost_LIBRARIES Link these to use the Boost libraries that you specified, not cached
+# Boost_INCLUDE_DIR This is almost the same as above, but this one is
+# cached and may be modified by advanced users
+#
+# Boost_LIBRARIES Link these to use the Boost libraries that you
+# specified: not cached
+#
# Boost_LIBRARY_DIRS The path to where the Boost library files are.
-# Boost_VERSION The version number of the boost libraries that have been found,
-# same as in version.hpp from Boost
-# Boost_LIB_VERSION The version number in filename form as its appended to the library filenames
+#
+# Boost_VERSION The version number of the boost libraries that
+# have been found, same as in version.hpp from Boost
+#
+# Boost_LIB_VERSION The version number in filename form as
+# it's appended to the library filenames
+#
# Boost_MAJOR_VERSION major version number of boost
# Boost_MINOR_VERSION minor version number of boost
# Boost_SUBMINOR_VERSION subminor version number of boost
-# Boost_LIB_DIAGNOSTIC_DEFINITIONS Only set on windows. Can be used with add_definitions
-# to print diagnostic information about the automatic
-# linking done on windows.
-
+#
+# Boost_LIB_DIAGNOSTIC_DEFINITIONS [WIN32 Only] You can call
+# add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINTIIONS})
+# to have diagnostic information about Boost's
+# automatic linking outputted during compilation time.
+#
# For each component you list the following variables are set.
# ATTENTION: The component names need to be in lower case, just as the boost
-# library names however the cmake variables use upper case for the component
+# library names however the CMake variables use upper case for the component
# part. So you'd get Boost_SERIALIZATION_FOUND for example.
#
# Boost_${COMPONENT}_FOUND True IF the Boost library "component" was found.
@@ -91,24 +158,44 @@
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
-OPTION(Boost_USE_MULTITHREADED
- "Use the multithreaded versions of the Boost libraries" ON)
-if (Boost_FIND_VERSION_EXACT)
- if (Boost_FIND_VERSION_PATCH)
- set( _boost_TEST_VERSIONS
- "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}")
- else (Boost_FIND_VERSION_PATCH)
- set( _boost_TEST_VERSIONS
- "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.0"
- "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
- endif (Boost_FIND_VERSION_PATCH)
-else (Boost_FIND_VERSION_EXACT)
- set( _boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
- "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
- "1.34" "1.33.1" "1.33.0" "1.33" )
-endif (Boost_FIND_VERSION_EXACT)
+IF(NOT DEFINED Boost_USE_MULTITHREADED)
+ SET(Boost_USE_MULTITHREADED TRUE)
+ENDIF()
+if(Boost_FIND_VERSION_EXACT)
+ # The version may appear in a directory with or without the patch
+ # level, even when the patch level is non-zero.
+ set(_boost_TEST_VERSIONS
+ "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}"
+ "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
+else(Boost_FIND_VERSION_EXACT)
+ # The user has not requested an exact version. Among known
+ # versions, find those that are acceptable to the user request.
+ set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+ "1.38.0" "1.38" "1.37.0" "1.37"
+ "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
+ "1.34" "1.33.1" "1.33.0" "1.33")
+ set(_boost_TEST_VERSIONS)
+ if(Boost_FIND_VERSION)
+ set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
+ # Select acceptable versions.
+ foreach(version ${_Boost_KNOWN_VERSIONS})
+ if(NOT "${version}" VERSION_LESS "${Boost_FIND_VERSION}")
+ # This version is high enough.
+ list(APPEND _boost_TEST_VERSIONS "${version}")
+ elseif("${version}.99" VERSION_EQUAL "${_Boost_FIND_VERSION_SHORT}.99")
+ # This version is a short-form for the requested version with
+ # the patch level dropped.
+ list(APPEND _boost_TEST_VERSIONS "${version}")
+ endif()
+ endforeach(version)
+ else(Boost_FIND_VERSION)
+ # Any version is acceptable.
+ set(_boost_TEST_VERSIONS "${_Boost_KNOWN_VERSIONS}")
+ endif(Boost_FIND_VERSION)
+endif(Boost_FIND_VERSION_EXACT)
+
# The reason that we failed to find Boost. This will be set to a
# user-friendly message when we fail to find some necessary piece of
# Boost.
@@ -155,9 +242,17 @@
ENDIF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
IF (Boost_${basename}_LIBRARY)
- SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
- GET_FILENAME_COMPONENT(Boost_LIBRARY_DIRS "${Boost_${basename}_LIBRARY}" PATH)
- SET(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
+ set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
+
+ # Remove superfluous "debug" / "optimized" keywords from
+ # Boost_LIBRARY_DIRS
+ FOREACH(_boost_my_lib ${Boost_${basename}_LIBRARY})
+ GET_FILENAME_COMPONENT(_boost_my_lib_path "${_boost_my_lib}" PATH)
+ LIST(APPEND Boost_LIBRARY_DIRS ${_boost_my_lib_path})
+ ENDFOREACH()
+ LIST(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
+
+ set(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
ENDIF (Boost_${basename}_LIBRARY)
@@ -170,6 +265,23 @@
)
ENDMACRO (_Boost_ADJUST_LIB_VARS)
+#
+# Runs compiler with "-dumpversion" and parses major/minor
+# version with a regex.
+#
+FUNCTION(_Boost_COMPILER_DUMPVERSION _OUTPUT_VERSION)
+
+ EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
+ ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+ OUTPUT_VARIABLE _boost_COMPILER_VERSION
+ )
+ STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
+ _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
+
+ SET(${_OUTPUT_VERSION} ${_boost_COMPILER_VERSION} PARENT_SCOPE)
+ENDFUNCTION()
+
+
#-------------------------------------------------------------------------------
@@ -199,8 +311,24 @@
MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
ENDIF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "boost ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} "
+ "is already in the cache. For debugging messages, please clear the cache.")
+ endif()
ELSE (_boost_IN_CACHE)
# Need to search for boost
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Boost not in cache")
+ # Output some of their choices
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Boost_USE_MULTITHREADED = ${Boost_USE_MULTITHREADED}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Boost_USE_STATIC_LIBS = ${Boost_USE_STATIC_LIBS}")
+ endif()
IF(WIN32)
# In windows, automatic linking is performed, so you do not have
@@ -225,23 +353,14 @@
ENDIF(WIN32)
SET(_boost_INCLUDE_SEARCH_DIRS
- "$ENV{ProgramFiles}/boost/boost_${Boost_FIND_VERSION_MAJOR}_${Boost_FIND_VERSION_MINOR}_${Boost_FIND_VERSION_PATCH}"
- "$ENV{ProgramFiles}/Boost"
+ C:/boost/include
+ C:/boost
+ "$ENV{ProgramFiles}/boost"
C:/library/boost
"C:/Program Files/boost"
- C:/boost
/sw/local/include
)
- SET(_boost_LIBRARIES_SEARCH_DIRS
- "$ENV{ProgramFiles}/boost/boost_${Boost_FIND_VERSION_MAJOR}_${Boost_FIND_VERSION_MINOR}_${Boost_FIND_VERSION_PATCH}/lib"
- "$ENV{ProgramFiles}/Boost"
- C:/library/boost/stage/lib
- "C:/Program Files/boost/stage/lib"
- C:/boost/lib
- /sw/local/lib
- )
-
# If BOOST_ROOT was defined in the environment, use it.
if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
set(BOOST_ROOT $ENV{BOOST_ROOT})
@@ -256,22 +375,34 @@
IF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
set(BOOST_INCLUDEDIR $ENV{BOOST_INCLUDEDIR})
ENDIF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
-
+
# If BOOST_LIBRARYDIR was defined in the environment, use it.
IF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
set(BOOST_LIBRARYDIR $ENV{BOOST_LIBRARYDIR})
ENDIF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
+
+ IF( BOOST_ROOT )
+ file(TO_CMAKE_PATH ${BOOST_ROOT} BOOST_ROOT)
+ ENDIF( BOOST_ROOT )
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Declared as CMake or Environmental Variables:")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " BOOST_ROOT = ${BOOST_ROOT}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " BOOST_INCLUDEDIR = ${BOOST_INCLUDEDIR}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " BOOST_LIBRARYDIR = ${BOOST_LIBRARYDIR}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
+ endif()
+
IF( BOOST_ROOT )
- file(TO_CMAKE_PATH ${BOOST_ROOT} BOOST_ROOT)
SET(_boost_INCLUDE_SEARCH_DIRS
${BOOST_ROOT}/include
${BOOST_ROOT}
${_boost_INCLUDE_SEARCH_DIRS})
- SET(_boost_LIBRARIES_SEARCH_DIRS
- ${BOOST_ROOT}/lib
- ${BOOST_ROOT}/stage/lib
- ${_boost_LIBRARIES_SEARCH_DIRS})
ENDIF( BOOST_ROOT )
IF( BOOST_INCLUDEDIR )
@@ -280,12 +411,9 @@
${BOOST_INCLUDEDIR} ${_boost_INCLUDE_SEARCH_DIRS})
ENDIF( BOOST_INCLUDEDIR )
- IF( BOOST_LIBRARYDIR )
- file(TO_CMAKE_PATH ${BOOST_LIBRARYDIR} BOOST_LIBRARYDIR)
- SET(_boost_LIBRARIES_SEARCH_DIRS
- ${BOOST_LIBRARYDIR} ${_boost_LIBRARIES_SEARCH_DIRS})
- ENDIF( BOOST_LIBRARYDIR )
-
+ # ------------------------------------------------------------------------
+ # Search for Boost include DIR
+ # ------------------------------------------------------------------------
# Try to find Boost by stepping backwards through the Boost versions
# we know about.
IF( NOT Boost_INCLUDE_DIR )
@@ -295,21 +423,33 @@
# Add in a path suffix, based on the required version, ideally
# we could read this from version.hpp, but for that to work we'd
# need to know the include dir already
- if (WIN32 AND NOT CYGWIN)
- set(_boost_PATH_SUFFIX boost_${_boost_VER})
- else (WIN32 AND NOT CYGWIN)
- set(_boost_PATH_SUFFIX boost-${_boost_VER})
- endif (WIN32 AND NOT CYGWIN)
+ set(_boost_BOOSTIFIED_VERSION)
- IF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
+ # Transform 1.35 => 1_35 and 1.36.0 => 1_36_0
+ IF(_boost_VER MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1_\\2_\\3"
- _boost_PATH_SUFFIX ${_boost_PATH_SUFFIX})
- ELSEIF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+")
+ _boost_BOOSTIFIED_VERSION ${_boost_VER})
+ ELSEIF(_boost_VER MATCHES "[0-9]+\\.[0-9]+")
STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1_\\2"
- _boost_PATH_SUFFIX ${_boost_PATH_SUFFIX})
- ENDIF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
- LIST(APPEND _boost_PATH_SUFFIXES "${_boost_PATH_SUFFIX}")
+ _boost_BOOSTIFIED_VERSION ${_boost_VER})
+ ENDIF()
+
+ list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}")
+ if(WIN32)
+ # For BoostPro's underscores (and others?)
+ list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}")
+ endif()
+
ENDFOREACH(_boost_VER)
+
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Include debugging info:")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " _boost_INCLUDE_SEARCH_DIRS = ${_boost_INCLUDE_SEARCH_DIRS}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " _boost_PATH_SUFFIXES = ${_boost_PATH_SUFFIXES}")
+ endif()
# Look for a standard boost header file.
FIND_PATH(Boost_INCLUDE_DIR
@@ -318,6 +458,10 @@
PATH_SUFFIXES ${_boost_PATH_SUFFIXES}
)
ENDIF( NOT Boost_INCLUDE_DIR )
+
+ # ------------------------------------------------------------------------
+ # Extract version information from version.hpp
+ # ------------------------------------------------------------------------
IF(Boost_INCLUDE_DIR)
# Extract Boost_VERSION and Boost_LIB_VERSION from version.hpp
@@ -326,6 +470,10 @@
SET(BOOST_VERSION 0)
SET(BOOST_LIB_VERSION "")
FILE(READ "${Boost_INCLUDE_DIR}/boost/version.hpp" _boost_VERSION_HPP_CONTENTS)
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "location of version.hpp: ${Boost_INCLUDE_DIR}/boost/version.hpp")
+ endif()
STRING(REGEX REPLACE ".*#define BOOST_VERSION ([0-9]+).*" "\\1" Boost_VERSION "${_boost_VERSION_HPP_CONTENTS}")
STRING(REGEX REPLACE ".*#define BOOST_LIB_VERSION \"([0-9_]+)\".*" "\\1" Boost_LIB_VERSION "${_boost_VERSION_HPP_CONTENTS}")
@@ -341,74 +489,109 @@
set(Boost_ERROR_REASON
"${Boost_ERROR_REASON}Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}")
ENDIF(NOT "${Boost_VERSION}" STREQUAL "0")
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "version.hpp reveals boost "
+ "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
+ endif()
ELSE(Boost_INCLUDE_DIR)
set(Boost_ERROR_REASON
"${Boost_ERROR_REASON}Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.")
ENDIF(Boost_INCLUDE_DIR)
+
+ # ------------------------------------------------------------------------
+ # Suffix initialization and compiler suffix detection.
+ # ------------------------------------------------------------------------
# Setting some more suffixes for the library
SET (Boost_LIB_PREFIX "")
- IF ( WIN32 AND Boost_USE_STATIC_LIBS )
+ if ( MSVC AND Boost_USE_STATIC_LIBS )
SET (Boost_LIB_PREFIX "lib")
- ENDIF ( WIN32 AND Boost_USE_STATIC_LIBS )
- SET (_boost_COMPILER "-gcc")
- IF (MSVC90)
- SET (_boost_COMPILER "-vc90")
- ELSEIF (MSVC80)
- SET (_boost_COMPILER "-vc80")
- ELSEIF (MSVC71)
- SET (_boost_COMPILER "-vc71")
- ENDIF(MSVC90)
- IF (MINGW)
- EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
- ARGS -dumpversion
- OUTPUT_VARIABLE _boost_COMPILER_VERSION
- )
- STRING(REGEX REPLACE "([0-9])\\.([0-9])\\.[0-9]" "\\1\\2"
- _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
- SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
- ENDIF(MINGW)
- IF (UNIX)
- IF (NOT CMAKE_COMPILER_IS_GNUCC)
- # We assume that we have the Intel compiler.
- SET (_boost_COMPILER "-il")
- ELSE (NOT CMAKE_COMPILER_IS_GNUCC)
- # Determine which version of GCC we have.
- EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
- ARGS -dumpversion
- OUTPUT_VARIABLE _boost_COMPILER_VERSION
- )
- STRING(REGEX REPLACE "([0-9])\\.([0-9])\\.[0-9]" "\\1\\2"
- _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
- IF(APPLE)
- IF(Boost_MINOR_VERSION)
- IF(${Boost_MINOR_VERSION} GREATER 35)
- # In Boost 1.36.0 and newer, the mangled compiler name used
- # on Mac OS X/Darwin is "xgcc".
- SET(_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
- ELSE(${Boost_MINOR_VERSION} GREATER 35)
- # In Boost <= 1.35.0, there is no mangled compiler name for
- # the Mac OS X/Darwin version of GCC.
- SET(_boost_COMPILER "")
- ENDIF(${Boost_MINOR_VERSION} GREATER 35)
- ELSE(Boost_MINOR_VERSION)
- # We don't know the Boost version, so assume it's
- # pre-1.36.0.
- SET(_boost_COMPILER "")
- ENDIF(Boost_MINOR_VERSION)
- ELSE()
- SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
- ENDIF()
- ENDIF (NOT CMAKE_COMPILER_IS_GNUCC)
- ENDIF(UNIX)
+ endif()
+ if (Boost_COMPILER)
+ set(_boost_COMPILER ${Boost_COMPILER})
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "using user-specified Boost_COMPILER = ${_boost_COMPILER}")
+ endif()
+ else(Boost_COMPILER)
+ # Attempt to guess the compiler suffix
+ # NOTE: this is not perfect yet, if you experience any issues
+ # please report them and use the Boost_COMPILER variable
+ # to work around the problems.
+ if (MSVC90)
+ SET (_boost_COMPILER "-vc90")
+ elseif (MSVC80)
+ SET (_boost_COMPILER "-vc80")
+ elseif (MSVC71)
+ SET (_boost_COMPILER "-vc71")
+ elseif (MSVC70) # Good luck!
+ SET (_boost_COMPILER "-vc7") # yes, this is correct
+ elseif (MSVC60) # Good luck!
+ SET (_boost_COMPILER "-vc6") # yes, this is correct
+ elseif (BORLAND)
+ SET (_boost_COMPILER "-bcb")
+ elseif("${CMAKE_CXX_COMPILER}" MATCHES "icl"
+ OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
+ if(WIN32)
+ set (_boost_COMPILER "-iw")
+ else()
+ set (_boost_COMPILER "-il")
+ endif()
+ elseif (MINGW)
+ if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
+ SET(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34
+ else()
+ _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
+ SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
+ endif()
+ elseif (UNIX)
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
+ SET(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34
+ else()
+ _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
+ # Determine which version of GCC we have.
+ IF(APPLE)
+ IF(Boost_MINOR_VERSION)
+ IF(${Boost_MINOR_VERSION} GREATER 35)
+ # In Boost 1.36.0 and newer, the mangled compiler name used
+ # on Mac OS X/Darwin is "xgcc".
+ SET(_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
+ ELSE(${Boost_MINOR_VERSION} GREATER 35)
+ # In Boost <= 1.35.0, there is no mangled compiler name for
+ # the Mac OS X/Darwin version of GCC.
+ SET(_boost_COMPILER "")
+ ENDIF(${Boost_MINOR_VERSION} GREATER 35)
+ ELSE(Boost_MINOR_VERSION)
+ # We don't know the Boost version, so assume it's
+ # pre-1.36.0.
+ SET(_boost_COMPILER "")
+ ENDIF(Boost_MINOR_VERSION)
+ ELSE()
+ SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
+ ENDIF()
+ endif()
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ endif()
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "guessed _boost_COMPILER = ${_boost_COMPILER}")
+ endif()
+ endif(Boost_COMPILER)
+
SET (_boost_MULTITHREADED "-mt")
+ if( NOT Boost_USE_MULTITHREADED )
+ set (_boost_MULTITHREADED "")
+ endif()
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_MULTITHREADED = ${_boost_MULTITHREADED}")
+ endif()
- IF( NOT Boost_USE_MULTITHREADED )
- SET (_boost_MULTITHREADED "")
- ENDIF( NOT Boost_USE_MULTITHREADED )
-
SET( _boost_STATIC_TAG "")
+ set( _boost_ABI_TAG "")
IF (WIN32)
IF(MSVC)
SET (_boost_ABI_TAG "g")
@@ -418,10 +601,45 @@
ENDIF( Boost_USE_STATIC_LIBS )
ENDIF(WIN32)
SET (_boost_ABI_TAG "${_boost_ABI_TAG}d")
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_STATIC_TAG = ${_boost_STATIC_TAG}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_ABI_TAG = ${_boost_ABI_TAG}")
+ endif()
# ------------------------------------------------------------------------
# Begin finding boost libraries
# ------------------------------------------------------------------------
+
+ SET(_boost_LIBRARIES_SEARCH_DIRS
+ C:/boost/lib
+ C:/boost
+ "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}_${Boost_SUBMINOR_VERSION}/lib"
+ "$ENV{ProgramFiles}/boost"
+ C:/library/boost/stage/lib
+ "C:/Program Files/boost/stage/lib"
+ C:/boost/lib
+ /sw/local/lib
+ )
+ IF( BOOST_ROOT )
+ SET(_boost_LIBRARIES_SEARCH_DIRS
+ ${BOOST_ROOT}/lib
+ ${BOOST_ROOT}/stage/lib
+ ${_boost_LIBRARIES_SEARCH_DIRS})
+ ENDIF( BOOST_ROOT )
+
+ IF( BOOST_LIBRARYDIR )
+ file(TO_CMAKE_PATH ${BOOST_LIBRARYDIR} BOOST_LIBRARYDIR)
+ SET(_boost_LIBRARIES_SEARCH_DIRS
+ ${BOOST_LIBRARYDIR} ${_boost_LIBRARIES_SEARCH_DIRS})
+ ENDIF( BOOST_LIBRARYDIR )
+
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_LIBRARIES_SEARCH_DIRS = ${_boost_LIBRARIES_SEARCH_DIRS}")
+ endif()
+
FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
SET( Boost_${UPPERCOMPONENT}_LIBRARY "Boost_${UPPERCOMPONENT}_LIBRARY-NOTFOUND" )
@@ -441,6 +659,8 @@
FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE
NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}
${Boost_LIB_PREFIX}boost_${COMPONENT}
@@ -450,6 +670,8 @@
FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG
NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}
${Boost_LIB_PREFIX}boost_${COMPONENT}-${_boost_ABI_TAG}
@@ -542,6 +764,10 @@
endforeach(COMPONENT)
endif (Boost_FOUND)
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] Boost_FOUND = ${Boost_FOUND}")
+ endif()
+
if (_Boost_MISSING_COMPONENTS)
# We were unable to find some libraries, so generate a sensible
# error message that lists the libraries we were unable to find.
@@ -623,18 +849,10 @@
ENDIF(Boost_FIND_REQUIRED)
ENDIF(Boost_FOUND)
- # Under Windows, automatic linking is performed, so no need to specify the libraries.
- IF (WIN32)
- IF (NOT MINGW)
- SET(Boost_LIBRARIES "")
- ENDIF (NOT MINGW)
- ENDIF(WIN32)
-
# show the Boost_INCLUDE_DIRS AND Boost_LIBRARIES variables only in the advanced view
MARK_AS_ADVANCED(Boost_INCLUDE_DIR
Boost_INCLUDE_DIRS
Boost_LIBRARY_DIRS
- Boost_USE_MULTITHREADED
)
ENDIF(_boost_IN_CACHE)
Modified: trunk/spark/cmake/FindSDL.cmake
===================================================================
--- trunk/spark/cmake/FindSDL.cmake 2009-02-12 08:15:05 UTC (rev 49)
+++ trunk/spark/cmake/FindSDL.cmake 2009-02-15 12:09:44 UTC (rev 50)
@@ -120,9 +120,9 @@
/opt/local
/opt/csw
/opt
- C:/library/SDL
- "C:/Program Files/SDL"
- C:/SDL
+ C:/library/SDL/lib
+ "C:/Program Files/SDL/lib"
+ C:/SDL/lib
)
ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
ENDIF(NOT SDL_BUILDING_LIBRARY)
Added: trunk/spark/cmake/FindZLIB.cmake
===================================================================
--- trunk/spark/cmake/FindZLIB.cmake (rev 0)
+++ trunk/spark/cmake/FindZLIB.cmake 2009-02-15 12:09:44 UTC (rev 50)
@@ -0,0 +1,37 @@
+# - Find zlib
+# Find the native ZLIB includes and library
+#
+# ZLIB_INCLUDE_DIR - where to find zlib.h, etc.
+# ZLIB_LIBRARIES - List of libraries when using zlib.
+# ZLIB_FOUND - True if zlib found.
+
+
+IF (ZLIB_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(ZLIB_FIND_QUIETLY TRUE)
+ENDIF (ZLIB_INCLUDE_DIR)
+
+FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+ C:/library/zlib123
+ C:/zlib123
+ "C:/Program Files/zlib123"
+)
+
+FIND_LIBRARY(ZLIB_LIBRARY zlib1.lib
+ C:/library/zlib123/projects/visualc6/Win32_DLL_Release
+ C:/zlib123/projects/visualc6/Win32_DLL_Release
+ "C:/Program Files/zlib123/projects/visualc6/Win32_DLL_Release"
+)
+
+# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+
+IF(ZLIB_FOUND)
+ SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
+ELSE(ZLIB_FOUND)
+ SET( ZLIB_LIBRARIES )
+ENDIF(ZLIB_FOUND)
+
+MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
Modified: trunk/spark/lib/zeitgeist/CMakeLists.txt
===================================================================
--- trunk/spark/lib/zeitgeist/CMakeLists.txt 2009-02-12 08:15:05 UTC (rev 49)
+++ trunk/spark/lib/zeitgeist/CMakeLists.txt 2009-02-15 12:09:44 UTC (rev 50)
@@ -51,7 +51,7 @@
#telnetserver/telnetdaemon.cpp
#telnetserver/telnetserver.cpp
#telnetserver/telnetserver_c.cpp
- #telnetserver/telnetsession.c
+ #telnetserver/telnetsession.cpp
)
include_directories(${CMAKE_SOURCE_DIR}/lib ${RUBY_INCLUDE_PATH})
Modified: trunk/spark/plugin/imageperceptor/imageperceptor.cpp
===================================================================
--- trunk/spark/plugin/imageperceptor/imageperceptor.cpp 2009-02-12 08:15:05 UTC (rev 49)
+++ trunk/spark/plugin/imageperceptor/imageperceptor.cpp 2009-02-15 12:09:44 UTC (rev 50)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,7 +21,14 @@
// #include <IL/il.h>
// #include <IL/ilu.h>
// #include <sstream>
+#ifndef WIN32
#include <GL/gl.h>
+#else
+#include <windows.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
+#endif
+
#include "imageperceptor.h"
#include <zeitgeist/logserver/logserver.h>
Modified: trunk/spark/plugin/inputsdl/inputdevicesdl.h
===================================================================
--- trunk/spark/plugin/inputsdl/inputdevicesdl.h 2009-02-12 08:15:05 UTC (rev 49)
+++ trunk/spark/plugin/inputsdl/inputdevicesdl.h 2009-02-15 12:09:44 UTC (rev 50)
@@ -33,7 +33,7 @@
#ifndef WIN32
#include <SDL/SDL.h>
#else
-#include <include/SDL.h>
+#include <SDL.h>
#endif
/** \class InputDeviceSDL
Modified: trunk/spark/plugin/inputsdl/inputsystemsdl.cpp
===================================================================
--- trunk/spark/plugin/inputsdl/inputsystemsdl.cpp 2009-02-12 08:15:05 UTC (rev 49)
+++ trunk/spark/plugin/inputsdl/inputsystemsdl.cpp 2009-02-15 12:09:44 UTC (rev 50)
@@ -28,8 +28,8 @@
#include <SDL/SDL_thread.h>
#include <SDL/SDL_syswm.h>
#else
-#include <include/SDL_thread.h>
-#include <include/SDL_syswm.h>
+#include <SDL_thread.h>
+#include <SDL_syswm.h>
#endif
#include "timersdl.h"
Modified: trunk/spark/plugin/inputsdl/inputsystemsdl.h
===================================================================
--- trunk/spark/plugin/inputsdl/inputsystemsdl.h 2009-02-12 08:15:05 UTC (rev 49)
+++ trunk/spark/plugin/inputsdl/inputsystemsdl.h 2009-02-15 12:09:44 UTC (rev 50)
@@ -34,7 +34,7 @@
#ifndef WIN32
#include <SDL/SDL.h>
#else
-#include <include/SDL.h>
+#include <SDL.h>
#endif
struct SDL_mutex;
Modified: trunk/spark/plugin/openglsyssdl/openglsystemsdl.cpp
===================================================================
--- trunk/spark/plugin/openglsyssdl/openglsystemsdl.cpp 2009-02-12 08:15:05 UTC (rev 49)
+++ trunk/spark/plugin/openglsyssdl/openglsystemsdl.cpp 2009-02-15 12:09:44 UTC (rev 50)
@@ -27,7 +27,7 @@
#ifndef WIN32
#include <SDL/SDL.h>
#else
-#include <include/SDL.h>
+#include <SDL.h>
#endif
using namespace std;
Modified: trunk/spark/test/fonttest/main.cpp
===================================================================
--- trunk/spark/test/fonttest/main.cpp 2009-02-12 08:15:05 UTC (rev 49)
+++ trunk/spark/test/fonttest/main.cpp 2009-02-15 12:09:44 UTC (rev 50)
@@ -3,7 +3,7 @@
#ifndef WIN32
#include <SDL/SDL.h>
#else
-#include <include/SDL.h>
+#include <SDL.h>
#endif
#ifdef _WIN32
#include <windows.h>
Modified: trunk/spark/test/inputtest/main.cpp
===================================================================
--- trunk/spark/test/inputtest/main.cpp 2009-02-12 08:15:05 UTC (rev 49)
+++ trunk/spark/test/inputtest/main.cpp 2009-02-15 12:09:44 UTC (rev 50)
@@ -3,7 +3,7 @@
#ifndef WIN32
#include <SDL/SDL.h>
#else
-#include <include/SDL.h>
+#include <SDL.h>
#endif
#ifdef _WIN32
#include <windows.h>
Modified: trunk/spark/test/scenetest/main.cpp
===================================================================
--- trunk/spark/test/scenetest/main.cpp 2009-02-12 08:15:05 UTC (rev 49)
+++ trunk/spark/test/scenetest/main.cpp 2009-02-15 12:09:44 UTC (rev 50)
@@ -4,7 +4,7 @@
#ifndef WIN32
#include <SDL/SDL.h>
#else
-#include <include/SDL.h>
+#include <SDL.h>
#endif
#include <zeitgeist/fileserver/fileserver.h>
Modified: trunk/spark/test/scenetest/md5mesh.cpp
===================================================================
--- trunk/spark/test/scenetest/md5mesh.cpp 2009-02-12 08:15:05 UTC (rev 49)
+++ trunk/spark/test/scenetest/md5mesh.cpp 2009-02-15 12:09:44 UTC (rev 50)
@@ -450,7 +450,11 @@
if (mMeshes!=0)
{
const salt::Matrix &mat = GetWorldTransform();
+
+#ifndef WIN32
#warning "Commented out calls to glProgramLocalParameter4fARB"
+#endif
+
#if 0
glProgramLocalParameter4fARB(GL_VERTEX_PROGRAM_ARB, 0, mat(0,0), mat(0,1), mat(0,2), mat(0,3));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-02-12 08:15:09
|
Revision: 49
http://simspark.svn.sourceforge.net/simspark/?rev=49&view=rev
Author: hedayat
Date: 2009-02-12 08:15:05 +0000 (Thu, 12 Feb 2009)
Log Message:
-----------
Fixes in make uninstall:
- Remove all symbolic links
- Remove installed directories
Modified Paths:
--------------
trunk/rcssserver3d/cmake_uninstall.cmake.in
trunk/rsgedit/cmake_uninstall.cmake.in
trunk/simspark-utilities/cmake_uninstall.cmake.in
trunk/spark/cmake_uninstall.cmake.in
Modified: trunk/rcssserver3d/cmake_uninstall.cmake.in
===================================================================
--- trunk/rcssserver3d/cmake_uninstall.cmake.in 2009-02-10 23:55:23 UTC (rev 48)
+++ trunk/rcssserver3d/cmake_uninstall.cmake.in 2009-02-12 08:15:05 UTC (rev 49)
@@ -17,6 +17,33 @@
ENDIF(NOT "${rm_retval}" STREQUAL 0)
ELSE(EXISTS "$ENV{DESTDIR}${file}")
MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ # But it might be an invalid symbolic link; so, it might be still there!
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
ENDIF(EXISTS "$ENV{DESTDIR}${file}")
ENDFOREACH(file)
+SET(directories "@INCLUDEDIR@/@CMAKE_PROJECT_NAME@"
+ "@LIBDIR@/@CMAKE_PROJECT_NAME@"
+ "@DATADIR@/@CMAKE_PROJECT_NAME@"
+ "@DATADIR@/doc/@CMAKE_PROJECT_NAME@"
+)
+
+FOREACH(dir ${directories})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ IF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove_directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ MESSAGE(STATUS "Directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ENDFOREACH(dir)
Modified: trunk/rsgedit/cmake_uninstall.cmake.in
===================================================================
--- trunk/rsgedit/cmake_uninstall.cmake.in 2009-02-10 23:55:23 UTC (rev 48)
+++ trunk/rsgedit/cmake_uninstall.cmake.in 2009-02-12 08:15:05 UTC (rev 49)
@@ -17,6 +17,33 @@
ENDIF(NOT "${rm_retval}" STREQUAL 0)
ELSE(EXISTS "$ENV{DESTDIR}${file}")
MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ # But it might be an invalid symbolic link; so, it might be still there!
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
ENDIF(EXISTS "$ENV{DESTDIR}${file}")
ENDFOREACH(file)
+SET(directories "@INCLUDEDIR@/@CMAKE_PROJECT_NAME@"
+ "@LIBDIR@/@CMAKE_PROJECT_NAME@"
+ "@DATADIR@/@CMAKE_PROJECT_NAME@"
+ "@DATADIR@/doc/@CMAKE_PROJECT_NAME@"
+)
+
+FOREACH(dir ${directories})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ IF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove_directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ MESSAGE(STATUS "Directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ENDFOREACH(dir)
Modified: trunk/simspark-utilities/cmake_uninstall.cmake.in
===================================================================
--- trunk/simspark-utilities/cmake_uninstall.cmake.in 2009-02-10 23:55:23 UTC (rev 48)
+++ trunk/simspark-utilities/cmake_uninstall.cmake.in 2009-02-12 08:15:05 UTC (rev 49)
@@ -17,6 +17,31 @@
ENDIF(NOT "${rm_retval}" STREQUAL 0)
ELSE(EXISTS "$ENV{DESTDIR}${file}")
MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ # But it might be an invalid symbolic link; so, it might be still there!
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
ENDIF(EXISTS "$ENV{DESTDIR}${file}")
ENDFOREACH(file)
+SET(directories "@DATADIR@/@CMAKE_PROJECT_NAME@"
+ "@DATADIR@/doc/@CMAKE_PROJECT_NAME@"
+)
+
+FOREACH(dir ${directories})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ IF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove_directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ MESSAGE(STATUS "Directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ENDFOREACH(dir)
Modified: trunk/spark/cmake_uninstall.cmake.in
===================================================================
--- trunk/spark/cmake_uninstall.cmake.in 2009-02-10 23:55:23 UTC (rev 48)
+++ trunk/spark/cmake_uninstall.cmake.in 2009-02-12 08:15:05 UTC (rev 49)
@@ -17,6 +17,33 @@
ENDIF(NOT "${rm_retval}" STREQUAL 0)
ELSE(EXISTS "$ENV{DESTDIR}${file}")
MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ # But it might be an invalid symbolic link; so, it might be still there!
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
ENDIF(EXISTS "$ENV{DESTDIR}${file}")
ENDFOREACH(file)
+SET(directories "@INCLUDEDIR@/@CMAKE_PROJECT_NAME@"
+ "@LIBDIR@/@CMAKE_PROJECT_NAME@"
+ "@DATADIR@/@CMAKE_PROJECT_NAME@"
+ "@DATADIR@/doc/@CMAKE_PROJECT_NAME@"
+)
+
+FOREACH(dir ${directories})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ IF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove_directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ MESSAGE(STATUS "Directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ENDFOREACH(dir)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-02-10 23:55:26
|
Revision: 48
http://simspark.svn.sourceforge.net/simspark/?rev=48&view=rev
Author: hedayat
Date: 2009-02-10 23:55:23 +0000 (Tue, 10 Feb 2009)
Log Message:
-----------
Rcssserver3d 0.6.1 release
Added Paths:
-----------
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/ChangeLog
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/NEWS
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/RELEASE
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/TEXT_INSTEAD_OF_A_MANUAL.txt
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/users/CMakeLists.txt
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/users/definitions.tex
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/users/gettingstarted.tex
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/users/introduction.tex
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/users/rcssmonitor3d.tex
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/users/simspark.tex
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/users/user-manual.tex
Removed Paths:
-------------
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/ChangeLog
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/NEWS
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/RELEASE
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/TEXT_INSTEAD_OF_A_MANUAL.txt
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/users/CMakeLists.txt
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/users/definitions.tex
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/users/gettingstarted.tex
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/users/introduction.tex
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/users/monitorspark.tex
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/users/simspark.tex
tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/doc/users/user-manual.tex
Deleted: tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-02-08 00:25:53 UTC (rev 42)
+++ tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/ChangeLog 2009-02-10 23:55:23 UTC (rev 48)
@@ -1,61 +0,0 @@
-2009-01-29 Hedayat Vatankhah <he...@gr...>
-
- * INSTALL:
- - added requirements
-
- * README:
- - updated with the recent changes
-
-2009-01-28 Hedayat Vatankhah <he...@gr...>
-
- * INSTALL:
- - added new installation instructions (cmake oriented)
-
- * data/rsg/agent/nao/nao.rsg:
- - disable VisionPerceptor
-
- * data/rsg/agent/nao/naoneckhead.rsg:
- * data/rsg/agent/nao/naoleg.rsg:
- * data/rsg/agent/nao/naoarm.rsg:
- - enabled RestrictedVisionPerceptor and ObjectState nodes
- - some whitespace fix
-
-2009-01-24 Hedayat Vatankhah <he...@gr...>
-
- * CMakeLists.txt:
- * cmake_uninstall.cmake.in:
- - added 'make uninstall' support
-
- * doc/users/CMakeLists.txt:
- * cmake/UseLATEX.cmake:
- - do not build users-manual.pdf by default. can be built using 'make pdf'
- - add an output to tell the user how it can build the manual
-
-2009-01-20 Hedayat Vatankhah <he...@gr...>
-
- * rcssmonitor3d/Makefile.am:
- - added rpath
-
- * rcssmonitor3d/rcssmonitor3d.rb:
- - changed monitorspark.rb to rcssmonitor3d.rb
-
- * rcssmonitor3d/main.cpp (MonitorSpark::InitApp):
- * simspark/main.cpp (SimSpark::InitApp):
- - adding rcss3d's installation directory to the list of resource locations.
-
- * windows/rcssserver3d_config.h:
- * configure.ac:
- - added new define: RCSS_BUNDLE_PATH to store rcss3d's data directory.
-
-2008-12-19 Hedayat Vatankhah <he...@gr...>
-
- * plugin/soccer/kickeffector/kickeffector.cpp:
- * plugin/soccer/driveeffector/driveeffector.cpp:
- * plugin/soccer/catcheffector/catcheffector.cpp:
- * plugin/soccer/visionperceptor/visionperceptor.cpp:
- * plugin/soccer/sayeffector/sayeffector.cpp:
- * plugin/soccer/pantilteffector/pantilteffector.cpp:
- * plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp:
- * plugin/soccer/agentstateperceptor/agentstateperceptor.cpp:
- - Replaced make_shared() with .lock() function call.(fixed compilation
- error with recent boost versions.)
\ No newline at end of file
Copied: tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/ChangeLog (from rev 43, trunk/rcssserver3d/ChangeLog)
===================================================================
--- tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/ChangeLog (rev 0)
+++ tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/ChangeLog 2009-02-10 23:55:23 UTC (rev 48)
@@ -0,0 +1,75 @@
+2009-02-09 Hedayat Vatankhah <he...@gr...>
+
+ * doc/users/user-manual.tex:
+ * doc/users/simspark.tex:
+ * doc/users/rcssmonitor3d.tex:
+ * doc/users/introduction.tex:
+ * doc/users/gettingstarted.tex:
+ * doc/users/definitions.tex:
+ * doc/users/CMakeLists.txt:
+ * doc/TEXT_INSTEAD_OF_A_MANUAL.txt:
+ - monitorspark -> rcssmonitor3d
+ - Say effector message lenght limit is 20 characters now
+ - Updated some info about RestrictedVisionPerceptor
+
+2009-01-29 Hedayat Vatankhah <he...@gr...>
+
+ * INSTALL:
+ - added requirements
+
+ * README:
+ - updated with the recent changes
+
+2009-01-28 Hedayat Vatankhah <he...@gr...>
+
+ * INSTALL:
+ - added new installation instructions (cmake oriented)
+
+ * data/rsg/agent/nao/nao.rsg:
+ - disable VisionPerceptor
+
+ * data/rsg/agent/nao/naoneckhead.rsg:
+ * data/rsg/agent/nao/naoleg.rsg:
+ * data/rsg/agent/nao/naoarm.rsg:
+ - enabled RestrictedVisionPerceptor and ObjectState nodes
+ - some whitespace fix
+
+2009-01-24 Hedayat Vatankhah <he...@gr...>
+
+ * CMakeLists.txt:
+ * cmake_uninstall.cmake.in:
+ - added 'make uninstall' support
+
+ * doc/users/CMakeLists.txt:
+ * cmake/UseLATEX.cmake:
+ - do not build users-manual.pdf by default. can be built using 'make pdf'
+ - add an output to tell the user how it can build the manual
+
+2009-01-20 Hedayat Vatankhah <he...@gr...>
+
+ * rcssmonitor3d/Makefile.am:
+ - added rpath
+
+ * rcssmonitor3d/rcssmonitor3d.rb:
+ - changed monitorspark.rb to rcssmonitor3d.rb
+
+ * rcssmonitor3d/main.cpp (MonitorSpark::InitApp):
+ * simspark/main.cpp (SimSpark::InitApp):
+ - adding rcss3d's installation directory to the list of resource locations.
+
+ * windows/rcssserver3d_config.h:
+ * configure.ac:
+ - added new define: RCSS_BUNDLE_PATH to store rcss3d's data directory.
+
+2008-12-19 Hedayat Vatankhah <he...@gr...>
+
+ * plugin/soccer/kickeffector/kickeffector.cpp:
+ * plugin/soccer/driveeffector/driveeffector.cpp:
+ * plugin/soccer/catcheffector/catcheffector.cpp:
+ * plugin/soccer/visionperceptor/visionperceptor.cpp:
+ * plugin/soccer/sayeffector/sayeffector.cpp:
+ * plugin/soccer/pantilteffector/pantilteffector.cpp:
+ * plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp:
+ * plugin/soccer/agentstateperceptor/agentstateperceptor.cpp:
+ - Replaced make_shared() with .lock() function call.(fixed compilation
+ error with recent boost versions.)
\ No newline at end of file
Deleted: tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/NEWS
===================================================================
--- trunk/rcssserver3d/NEWS 2009-02-08 00:25:53 UTC (rev 42)
+++ tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/NEWS 2009-02-10 23:55:23 UTC (rev 48)
@@ -1,684 +0,0 @@
-[0.6.1]
-This is the first release of the simulator after RoboCup 2008 competitions,
-and the first release of rcssserver3d package as a separate package which
-uses simspark package to implement a hunamoid soccer simulation environment.
-In this version of the simulator, restricted vision perceptor is enabled again,
-and is going to be used in 2009 competitions. You can read more about this
-perceptor in 0.5.9 NEWS section.
-Finally, we do not use autotools for our build system anymore. You should use
-CMake (version 2.6) to build the package. See INSTALL for further installation
-instructions.
-
-* Restricted Vision:
- - restricted vision perceptor is installed on Nao.
-
-* New requirements for building the pacakge:
- - You'll need CMake 2.6 to configure and build the package
- - this package depends on simspark package, so you should install it first
-
-* Some small enhancements and bug fixes
-
-[0.6]
-This release is the final version for RoboCup 2008 in Suzhou China. It
-is little different from version 0.5.9 in simulation, excepting some
-changes for the rule of RoboCup 2008, including the vision perceptor.
-And also, the eye-catching sky and goal are added. The monitor
-protocol is improved due to the team requirement.
-
-* Physics:
- - set ball angluar drag to 0.00005
-
-* Vision perceptor:
- The old vision perceptor (just the same as last year) is used for
- both Nao and soccerbot058.
-
-* Eye-Catcher:
- - the sky box is added
- - the goal with net is added
-
-* Monitor Protocol ( Thanks Carlos from Borregos3D):
- - Add 'move' command for setting the agent's position and rotation.
- The whole command may like this:
- (agent (team $teamname)(unum $id)(move $x $y $z $dir))
- where, ($x, $y, $z) is the desired position, and $dir is the
- desired face direction of the robot.
- - Fix bug in set ball command.
-
-* Rule bug fix:
- - fix bug of the goal kick position
- - fix bug of the size of penalty
-
-[0.5.9]
-This release is the candidate of RoboCup 2008. There are some
-important improvements. Firstly, the physics parameters are well
-adjusted to make the simulation more real and stabler. Secondly, the
-restrict vision perceptor is used, with which the vision range is
-limited, but more details will be seen, i.e. the head, hands and feet
-of robots can be seen. Furthermore, the soccer rule and visual
-features are improved.
-
-* Physics Parameters:
- Some physics parameters are adjusted to make the simulation more real
- and stabler.
- - Joint parameters: the max force and max speed of the joint are
- restricted, and some other parameters are modified.
- - Ball parameters: the parameters of drag are modified.
-
-* Restrict Vision:
- The restrict vision perceptor is installed both in nao and
- soccerbot058. This perceptor have some restriction compared with
- original vision perceptor. Firstly, the robots can only see object in
- the limited angle range (both horizontal and vertical angle ranges
- are [-60, 60] in degree). Secondly, the frequent is restricted, the
- robot can get one vision message every 3 cycles. Furthermore, note
- that the noise is added to the vision information.
-
- However, the information is richer: the robot's torso, head, hands
- and feet can be seen. The flags placed in the field can also be seen
- (They are no visual in the screen now, but the robot can see them).
- Four flags are placed at the field corners (the height is 0), and the
- four flags are placed at the goal posts (the corner of the goal).
-
-* Visual:
- - The Nao robot can be identified by team colors and numbers. You can
- play a match with Nao robots ;-)
- - the monitor camera can be controlled by number keys (from 1 to 7)
-
-* Soccer Rule:
- - Field Size: the field size is 12mx8m, the center circle radius is
-1.3m, the penalty size is 1.2mx4m. More information please see
-naosoccersim.rb.
- - Kick Off: the kicking off team can enter the center circle, and the
- opponents will be moved away from the center circle.
-
-[0.5.8]
- In this release, we have a simulator which is much more like the
- RoboCup Humanoid League: The smaller size, the smaller robot and
- ball. The integrated agent is added as a new feature. Furthermore,
- the external monitor works now.
-
-* New Robot Models:
- - Nao: robot from Aldebaran Robotics, see rsg/agent/nao/nao.rsg. The
- robot looks great with textures.
- - soccerbot058: robot based on soccerbotcomp with joint limits, and
- its size is scaled ( default 0.1 ), see
- rsg/agent/soccerbot058/soccerbot.rsg.
-
-* New Nao Soccer Simulation:
- The simulator start naosoccersim.rb in default now, the new field
- size is the same as RoboCup Standard Platform League, please see
- naosoccersim.rb for details. The old soccersim.rb are still there,
- you can switch between naosoccersim and soccersim in simspark.rb.
-
-* New Feature:
- - Integrated Agent: The agent can run internally now, in this case it
- is easier to debug the skill that you have designed, since it can get
- the simulation information directly. Note that the action is
- performed with a delay of one cycle (This is just like external
- agent). There is an example in plugin/soccer/agentintegration. To run
- the demo just enable two lines in the simspark.rb:
- sparkSetupTrain()
- addIntegratedAgent('SoccerbotBehavior',1)
-
-* Important Fixes:
- - the external monitor works now, you can run to monitor remotely(set
- $monitorServer in spark.rb). And also, the internal monitor can be
- disabled by setting $enableInternalMonitor to false in simspark.rb.
- - the OBJ importer is extended, we have really good 3D graphics now.
- - joint limits: the simulation runs stably with joint limits.
-
-For details have a look into the ChangeLog coming with the package.
-
-[0.5.7]
- This is the first release after the competition in Atlanta.
- The simulator now contains the auto-adjust speed mode(by default),the
- server will run slower when needed, and print warning. We also
- applied changes what be made in Atlanta, and re-enabled the
- communication between robots. Furthermore, we imported some new
- features from SimSpark Project, including rsgedit, rosimporter, and
- etc. Although they are optional, you may want to try the rsgedit,
- please install the wxWidgets[1] firstly and take a look at the 'Quick
- start to RsgEdit' in the doc directory. Finally, there is a new robot
- model which is built with composite bodies for better performance.
- The monitor logger was also bug-fixed and improved. With the help of
- the community, the documents about the server are available now, but
- they are still in progress.
-
-* Documents:
- - the user's manual in doc/users
- - the server developer's manual in doc/devel
- - there are also some useful information at SimSpark Wiki[1]
-
-* Important fixes:
- - mointor logger:
- - fixed methods to work properly.
- - solve the update problem (reported by team Apollo).
- - remove invisible nodes to save bandwidth(thanks to Carlos
- Bustamante from Borregos3D).
-
-* Features:
-- applied Atlanta 2007 server changes:
- - 'm' and 'c' for killing agents
- - two robot models with different facilities
- - using materials with textures
- - free kick distance changed to 4.5
- - one half time (8 mins)
- - agents can beam in Goal_Left or Goal_Right play modes
- - no longer possible to move agents by pressing m
-- re-enabled communication, the soccerbot056 has SayEffector and
- HearPerceptor
-- add AdjustSpeed mode (It is enabled by default). In this mode, the
- server will run slower when needed.
-- new multi-threaded implementation
-- rosimporter, model importer for RoSiML[2] modeling language
-- rsgedit, a cool simspark simulator with graphic user interface.
-- soccerbotcomp, the new robot mode which is built with composite
- bodies, it can advance the simulation speed.
-- include some useful utilities: tinyxml, wxflatnotebook and wxscintilla
-
-For details have a look into the ChangeLog coming with the package.
-
-[1] http://simspark.sourceforge.net/wiki/
-
-[2] www.wxwidgets.org
-
-[3] Laue, T., Spiess, K., Refer, T.: Simrobot - a general physical
-robot simulator and its application in robocup. In: RoboCup 2005:
-Robot Soccer World Cup IX. Lecture Notes in Artificial Intelligence,
-Springer (2006)
-
-[0.5.6]
-This is the final release for the competition in Atlanta, GA. The simulator
-now contains the new timer running in single-threaded mode by default. We also
-fixed the soccer rules plug-in (communication and offside not supported
-yet). Furthermore, we completed the game state info display in both the
-internal and external monitors, and fixed the trainer command parser to work
-with the new agents. The SoccerBot model was modified, the performance was
-slightly improved, and several bugs were fixed.
-
-* Important fixes:
-
-beameffector & singlematiniteffector:
-- fixed beaming with rotation
-
-gyrorateperceptor:
-- output is now in the local coordinate system of the robot
-
-trainercommandparser:
-- fixed several methods to work with the new agent
-
-* Features:
-
-- new GameTimePerceptor added which senses game time instead of sim time (not
- used in Atlanta)
-- GameStatePerceptor added which provides the agent with information about the
- current game state (play mode, game time, unum, and side)
-- play modes and rules re-integrated (no communication and no offside yet)
-- slight performance improvement by caching references to important classes
-- game state info display fixed in the internal and external monitors
-- key bindings for 7 different camera positions, kick off, and drop ball
-- the SoccerBot was modified to have a two-part torso to facilitate stand-up
- motions, it got colliders (and very small masses) at the hands, it uses the
- ForceResistanceReceptor instead of the TouchPerceptor
-- the hinge joint and universal joint effectors will not set any velocity if a
- joint stop is reached to prevent large forces and instabilities (not used in Atlanta)
-- the maximum joint velocity that can be requested was restricted to 9000
- deg/sec (for stability reasons)
-- Field size was reduced to 50m x 32m, penalty area reduced to 8m x 19.5m
-- Goal size was increased to 9m width and 4m height
-- The ball model was improved according to suggestions from wjq and Tobias Warden
-- The visualization of the corner flags was moved back to allow proper corner kicks
-
-
-[0.5.5]
-The simulator has been ported to MacOS, the network messages were shortened,
-we did some performance tuning, improved the log player, added a new perceptor,
-and fixed some bugs.
-
-* Important fixes:
-
-simspark:
-- fixed setup of goal flags (thanks Carlos)
-- several files were missing break statments in the physicsserver directory
- (thanks Shivaram)
-
-gyrorateperceptor:
-- "rt" keyword was added to enable correct parsing of the perceptor values
-
-* Features:
-
-- MacOS compatibility (please see README.MacOS file for comments)
-- individual ODE CollisionSpaces are used to encapsulate each agent and
- each goal now
-- the protocols for the monitor and the agents have been shortened
-- new basic importer for Wavefront OBJ files
-- textures can be enabled for the ball, the field, and the agent torso
- (player numbers :-) )
-- several computationally expensive function calls have been replaced
- with calls to more efficient versions
-- the log player now plays logfiles in forward and backward mode, and
- supports pause, and forward/backward stepping
-- a new perceptor (ForceResistancePerceptor) was implemented that gives
- feedback about position and resulting force due to a collision of the
- body the perceptor is attached to (see doc/TEXT_INSTEAD_OF_A_MANUAL.txt
- for details)
-- BeamEffector now takes 3 arguments: position (x and y) and angle in the
- x-y-plane (rotation around z-axis) at the beam position (DEG)
-
-[0.5.4]
-This release contains fixes for known problems (e.g. in the
-visionperceptor or the spark sample agent), updates of old plug-ins
-for the new simulation (beameffector, initeffector), and new features
-like a log player, and new perceptors.
-
-* Important fixes:
-
-visionperceptor:
-- patch (vision6) by Yuan to fix problems related to the local
- reference frame of the robot
-
-soccerbot:
-- anchor of the ankle joint was set higher to avoid foot penetration
- when doing large steps (thanks Guangbin Cui)
-
-beameffector:
-- all the bodies below the parent of the effector are moved now
- instead of only one (thanks Amin)
-
-initeffector:
-- move all the bodies below the parent of the effector to the initial position
-
-simspark:
-- increased goal height
-- reduced ball size and mass
-- internal rendering can be switched off without affecting timing now
-- support for ODE collision spaces was implemented by Markus
-- a 64-Bit compile issue was fixed (thanks Sander van Dijk)
-
-agentspark:
-- patch by snow to fix problems in the GetMessage function
-- sending init message in the SoccerBotBehavior
-
-* Features:
-
-- simspark now uses the new SingleMatInitEffector to initialize
- agents based on their teamname (different initial position and
- different uniform color)
-- simspark can record logfiles (thanks Hesham & Amin)
-- monitorspark can playback the recorded logfiles (thanks Hesham & Amin)
-- new gyro rate perceptor (thanks Hedayat)
-- new binary touch sensor
-
-
-[0.5.3]
-This release contains some fixes for the offside code and some
-eye candy for the lite monitor. Furthermore, it includes the new
-Fujitsu HOAP-2 inspired robot for simspark as well as the derived
-SoccerBot (work in progress), and some improvements to the physics
-code (mainly related to stability issues).
-
-* Features:
-
-- rcssmonitor3D-lite features a SkyBox (by Heni Ben Amor) and improved
- colors and lights (by Tobias Warden). Please see the comment about
- texture files in the INSTALL file.
-- simspark includes hoap2.rsg and soccerbot.rsg robot models
-- agent communication was restricted to a message length of 20 Bytes in
- rcssserver3D
-
-* Important fixes:
-
-rcssmonitor3D-lite:
-- toggling pause with p (r will be used for assigning free kicks)
-- correct aspect in 2D overview
-- Mousehandling patch (by Junqing Wang)
-
-rcssserver3D:
-- several fixes for the offside rule code
-- fixed bug that prevents arguments to be passed to SPADES (by Sander van Dijk)
-
-simspark:
-- fixed bug in the sceneffector that resulted in a crash if defines were used in RSG
- agent descriptions
-- modified several parameters of the physics system to get a more stable simulation
-- fixed the fixed joint type ;-)
-
-
-[0.5.2]
-This is mainly a bug fix release to get a stable version and change some parameters
-for the RoboCup-2006 in Bremen. Some new features, mainly in the monitor are
-introduced as well.
-
-* Features (general):
-
-- the catch margin of the catch effector has been reduced to 0.8m and the goal
- height was increased to 1.6m to reflect the stronger goalie capabilities and
- offside rule implications.
-- the monitor features a new autocam mode, "picture-in-picture" view, a
- display of the current camera mode, and the ground texture can be toggled
-- logfiles can now be stepped backwards
-- agenttest was updated with a say command and sample code
-
-* Important fixes:
-
-- the calculation of the torque vector in the kickeffector was fixed
-- the parameters for the pan/tilt effector are checked for NAN
-- the list of the monitor keybindings was updated
-- a bug in offside was fixed that could occur if a player and the ball cross the
- opponents line of defense, and this player was the last one to shot the ball
- before crossing.
-- the code has been updated for gcc 4.1
-- some bugs relating to kickoff have been fixed
-- say effector ignores some illegal characters
-
-
-[0.5.1]
-Release 0.5.1 contains mainly two fixes:
-- the Offside rules are now closer to the FIFA rules.
-- the RestrictedVisionPerceptor (RVP) was hardly useable. The RVP
- can now be controlled by using a PanTilt Effector.
-
-
-[0.5]
-This release introduces a few new features, and also some bugfixes
-(and probably some new bugs :). Important new features and fixes are
-as follows:
-
-* Features (soccer):
-
-- Goalies.
- Players with uniform number '1' can catch the ball using the (catch)
- command.
-
-- A restricted vision perceptor, so that not all other agents are
- visible at the same time. With this perceptor, the communication
- introduced in the 0.4 release becomes important.
-
-- The offside and some other rules have been cleaned up and some bugs
- have been removed. Also, files that have been missing in the
- 0.4. release are now present.
-
-- rcssmonitor3D-lite looks a little more interesting now, and
- some bugs with the random number generators have been fixed.
-
-* Features (general):
-
-- a couple of new physics functions have been added, general simulation
- settings have been fixed. This doesn't change the current soccer
- simulation, but is important for the general simulator.
-
-
-[0.4]
-This release includes some speed improvements, agent communication,
-an implementation of the offside rule, and a first, unfinished version
-of the new legged-sphere agent type amongst other things.
-Here is a summary with some more details:
-
-* Features (general):
-
-- A cache for node references has been added to the Zeitgeist
- core to speed up the simulation considerably. Thanks go to the
- Brainstormers3D team for the initial patch and to Markus Rollmann
- for the modification and integration.
-- The Spark based simulation (which will be used in the future for
- simulations using the articulated agents) has been made much more
- flexible by Markus Rollmann.
-- A sample agent and behaviors for a Spark based soccer simulation
- using either small cars or legged-sphere agents has been
- added. Currently, the legged-sphere agents are used by default.
- The behavior of the agents is very simple (in the legged-sphere case)
- and is solely meant to demonstrate how to use the new perceptors and
- effectors.
-
-* Features (soccer):
-
-- The offside rule has been implemented by Hesham Ebrahimi
-- Agent communication is now possible. It is based on the
- 2D communication model. Documentation can be found in the
- file doc/TEXT_INSTEAD_OF_A_MANUAL.txt. Thanks go again to
- Hesham Ebrahimi for the implementation and documentation
-- The lite-monitor is able to draw velocities in 2D and 3D.
- Added by Jan Murray.
-
-* Important fixes:
-
-- Fix for gcc 4.0 and above compatibility by Jan Murray
-- An issue with 64bit builds, reported by Li Yang and Patrick Riley,
- was fixed by Markus Rollmann
-- The distance error in the vision perceptor was made dependent on the
- real distance by Oliver Obst
-
-[0.x.x]
-This release has been ported to OS X. Besides the normal
-requirements, it requires an X server to be installed on the machine,
-along with a glut library for X windows.
-
-[0.3]
-This release is intended to be used as official version on RoboCup 2004.
-With respect to the soccer rules, this release mainly fixes some bugs contained
-in the 0.2.2 release. New things here are both an automatic and a manual drop
-ball feature and physical goal posts.
-With respect to the simulation system itself and usability, a few keys have
-been added to the rcssmonitor3d-lite and the system shuts down automatically
-after a match is over. Printing messages is turned off by default now (can be
-changed by adding log streams from a ruby file).
-Bugs that have been fixed included some math things (like a bug in the setup of
-axis aligned bounding boxes), bugs in the use of SPADES, and in the sample
-agent communication server.
-
-[0.2.2]
-This release adds both soccer simulation specific features (like better rules
- and an initial version of a logplayer) and general simulation features
-(almost all ODE features are supported now, and an initial version of an
-alternative simulation server as a SPADES replacement). For the 0.3 release,
-some of these new features need some polishing :-). Below a short summary of
-new features.
-
-* Features (soccer):
-
-- The rcssmonitor3D protocol has been changed to produce less redundant data.
- Specifically, field flags will only be sent once, and information like team
- names and scores will be sent only if they change.
-- rcssmonitor3D-lite can be used as a logplayer now. To do this, replace the
- CommServer plugin setup in rcssserver3D-lite.rb by the LogfileServer setup.
- Monitor logfiles get recorded by SPADES automatically, and the new monitor
- protocol can be used as Logfile format.
-- The rcssmonitor3D - library got an user-friendly interface.
-- rcssmonitor3D-lite looks better now and the display is more informative.
-- The body and effector parameters have been changed based on suggestions from
- the mailing lists.
-- A trainercommandparser has been added so that it is possible to use soccer
- monitor applications as trainer program (to repoduce specific situations etc).
-- Players are moved away from the ball in certain situations (like kick in for
- the other team or kick off, etc).
-- It is possible to do automatic kick offs now (in rcssserver3D.rb).
-- Due to various improvements and changes, the simulator is now reasonable fast
- to extend the half time length to 4 minutes; suggestions for the competition
- match lenght are welcome.
-- Players accelerate (and break) faster; something like air resistance or
- friction was added to the players and the ball so that they eventually stop
- with no acceleration.
-- The torque from the kicker was made configurable from rcssserver3D.rb
-- An experimental say-effector has been added; up to now, only monitors
- (and trainers implemented as monitors) can hear the messages.
-
-* Features (general):
-
-- Several types of ODE joints are supported now.
-- An initial version of a generic simulation server has been added. It
- reimplements some of the more general SPADES concepts (like network support
- and a run loop). It is intended to use it as an alternative to SPADES when
- reproducibility of events is not key. The advantage is that faster
- simulations (or simulations with more agents) are possible by less overhead.
-- A general description language for 3D simulations has been added. By using
- this description language, it is possible to set up different 3D simulations
- based on text configuration files. Simulations are described by sets of
- S-Expressions (any other format possible by changing plugins).
-- The ScriptServer has been changed so that ruby functions can also read back
- values from the simulator easily.
-- Body controllers have been introduced. Body controllers can be used to
- constrain/control the motion of associated bodies (things like adding drag
- forces or changing the "bouncyness" of objects can be controlled).
-- Added a tool that visualizes the internal zeitgeist class hierarchy.
-- Added a new library libspark that contains an application framework for
- applications using both liboxygen and libkerosin classes.
-- Added a new application SimSpark. SimSpark is a monolithic simulator bases
- on libspark. With this new simulator, we have been testing most of the new
- generic features (like the description language and ODE joints) we have been
- adding.
-- Got rid of the rcssbase package dependency. The "net" part of this package
- is part of rcssserver3D now and has been extended by TCP sockets. The list
- of required libraries should be reasonable small now.
-- Added simspark demo simulations.
-
-* Important fixes/Changes (both soccer specific and general):
-
-- The simulator compiles with recent versions of boost (tested with 1-31-0).
-- Goals are properly counted now.
-- Goals are only 50cm heigh now because agents cannot jump high.
-- The default torque from the kicker is low now (was way to high before).
-- Building the API documentation has been reduced to only the necessary cases.
-- Some math bugs in libsalt have been fixed.
-- The kerosin library has been overhauled (lights / meshes / etc).
-- Added support to update cached script variables after reading ruby files.
-
-[0.2.1]
-This is a bugfix release. It removes some (but not all) bugs found
-in rcssserver3D-0.2.
-
-- Configuration was made a little stricter and more complete so that
- it should be easier to install the whole thing.
-- The missing agenttest.rb file is included into the distribution
-- The Makefile.am's have been fixed for those not building the libkerosin part.
-- A fix for the recent SPADES versions has been added.
-- A major bug with the weight of objects in the simulation has been removed.
- The dynamics of the drive of the robots and of the kicker have been adapted.
- (This bug was found after a report from Nuno Lau on the sserver list).
-- The artificial slowdown of bodies has been removed.
-- The default timer of the sample agents (agenttest) is now jiffies.
-
-A few features have been added to the zeitgeist library. This is mostly stuff
-dealing with the ruby interface.
-
-
-[0.2]
-This release adds already big parts of the soccer specific parts to the
-simulator. All soccer specific things are realized as plugins to the
-simulator, they are located in the soccer bundle in plugin/soccer/.
-
-- rcssmonitor3D and soccer simulation:
- Starting with our simple monitor: here are the most visible changes.
- You can see a soccer field with two goals, a ball and agents in different
- colors dependend on the side they are playing on.
- You can use keys 'a', 's,', 'd', and 'w' to move the camera (as was as
- the mouse). The monitor can send simple commands to the simulator now.
- ('k' is of kick off, that is what you probably wanted to know).
- The soccer field is a standard FIFA size field with variable size, same with
- the ball and goals.
-- Soccer Plugins
- Here is the really big part of the changes. Agents have an (omni-)drive and
- a kicker now, they can perceive the environment with a kind of 360ओ omnicam
- and they get updates about the game state and things like the battery state.
- Using the omnidrive, agents can do 100m in something about 13s or 14s.
-
-On startup, the simulator will start two different types of agents now. Even
-though there are only a few soccer rules implemented, it should be possible
-to implement a simple soccer team. To facilitate programming a new team, we
-enhanced the sample client a bit.
-
-Finally, we added a small text (lacking a comprehensive manual),
-describing the basic features of the simulated robots in the simulation.
-
-[0.1]
-This is the initial release of rcssserver3D. To get an idea of what
-rcssserver3D provides in general, please see also the file README.
-
-- liboxygen / libkerosin
- libkerosin, the library containing the big part of the simulation
- system has been split up. We have now liboxygen containing the
- pure simulator part, and libkerosin containing the graphical output,
- user input and stuff like this. Because of issues with different
- OpenGL drivers, libkerosin is currently not used for graphical
- output. Another advantage of the split into liboxygen and libkerosin
- is that we can have a standalone simulator with no graphics.
- By default, libkerosin will not be build (if you want to build it
- anyway: libkerosin needs a few other libaries. See the
- documentation for details).
-
-- SPADES integration
- For handling agents as external processes, we integrated SPADES into
- the simulator. SPADES is a middleware system for agent-based
- distributed simulation and was introduced by Patrick Riley on the
- RoboCup 2002 symposium. Among other things, the simulator gets a
- model of simulation time and support for external monitors by using
- SPADES.
-
-- GameControlServer
- We added a GameControlServer as central instance for keeping
- information and classes relevant to agents in a simulation. An
- important part of the GameControlServer is a reference to a
- parser responsible for parsing messages from agents into an internal
- representation. Parsers can be plugged in into the
- GameControlServer, so the simulator does not depend on a fixed
- protocol. Parsers are also responsible for generating messages from
- the internal representation.
-
-- S-Expressions parser
- As a specific instance of a pluggable parser, we implemented a
- parser for parsing and generating S-Expressions (lists as used in
- functional programming languages like LISP or Scheme). We also
- discussed using XML as protocol between agents and simulator. There
- was no clear joint position for or against XML or
- S-Expressions. There is no XML parser module now because noone
- implemented it :)
-
-- CreateEffector
- We added a CreateEffector. The idea behind the CreateEffector is
- that once the agents connected to the simulator, they do not have a
- physical representation, other effectors or perceptors yet. By using
- the CreateEffector, agents can request specific effectors,
- perceptors, and bodies. Right now, the create effector requests a
- default agent with a perfect vision sensor, a simple force effector,
- an InitEffector for changing the team name, and a sphere like body.
-
-- simple external monitor
- To get an impression of what actually happens we implemented a
- simple external monitor based on simple OpenGL stuff (it does not
- use our libkerosin library). The external monitor also uses
- sexpressions as syntax. The protocol is even more preliminary
- than the agent protocol...
-
-- a simple external SPADES agent
- We also implemented a very simple agent as sample implementation for
- external agents. The sample agent does (almost) nothing.
-
-- ...
-
-[Demo]
-
-Physical Simulator as shown on RoboCup 2003 symposium
-=====================================================
-- libzeitgeist
- A class object system as core of the simulation system. A class
- object is just a factory of class instances. In addition to this
- mechanism, it also implements an object hierarchy. This hierarchy is
- essentially a virtual file system, where the 'directories' and
- 'files' are instances of C++ classes. These two concepts are quite
- intertwined with each other, as class objects can also live inside
- the object hierarchy. Objects within the hierarchy are identified
- with a unique name. Class objects can also be loaded as plugins
- (loadable modules).
-
-- libkerosin
- A physical simulator for simulation of rigid body dynamics based on
- ODE. We created a library that contains the big part of the
- simulator including visualization, physics, geometry, agents. We can
- also handle user input and playing sounds. The simulator library
- build upon the class object system mentioned above.
-
-- demo
- A demo application with some spheres as agents. Agents try to get
- some food. The agents are part of the simulator loop; a simulation
- step is over if all agents finished thinking. Because of this, agents
- have infinite thinking time (in priciple). There is no model of time.
-
Copied: tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/NEWS (from rev 43, trunk/rcssserver3d/NEWS)
===================================================================
--- tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/NEWS (rev 0)
+++ tags/RCSSSERVER3D_0.6.1_RELEASE/rcssserver3d/NEWS 2009-02-10 23:55:23 UTC (rev 48)
@@ -0,0 +1,688 @@
+[0.6.1]
+This is the first release of the simulator after RoboCup 2008 competitions,
+and the first release of rcssserver3d package as a separate package which
+uses simspark package to implement a hunamoid soccer simulation environment.
+In this version of the simulator, restricted vision perceptor is enabled again,
+and is going to be used in 2009 competitions. You can read more about this
+perceptor in 0.5.9 NEWS section.
+Finally, we do not use autotools for our build system anymore. You should use
+CMake (version 2.6) to build the package. See INSTALL for further installation
+instructions.
+
+* Restricted Vision:
+ - restricted vision perceptor is installed on Nao.
+
+* New requirements for building the pacakge:
+ - You'll need CMake 2.6 to configure and build the package
+ - this package depends on simspark package, so you should install it first
+
+* New program names:
+ - agentspark is now called rcssagent3d
+ - monitorspark is now called rcssmonitor3d
+
+* Some small enhancements and bug fixes
+
+[0.6]
+This release is the final version for RoboCup 2008 in Suzhou China. It
+is little different from version 0.5.9 in simulation, excepting some
+changes for the rule of RoboCup 2008, including the vision perceptor.
+And also, the eye-catching sky and goal are added. The monitor
+protocol is improved due to the team requirement.
+
+* Physics:
+ - set ball angluar drag to 0.00005
+
+* Vision perceptor:
+ The old vision perceptor (just the same as last year) is used for
+ both Nao and soccerbot058.
+
+* Eye-Catcher:
+ - the sky box is added
+ - the goal with net is added
+
+* Monitor Protocol ( Thanks Carlos from Borregos3D):
+ - Add 'move' command for setting the agent's position and rotation.
+ The whole command may like this:
+ (agent (team $teamname)(unum $id)(move $x $y $z $dir))
+ where, ($x, $y, $z) is the desired position, and $dir is the
+ desired face direction of the robot.
+ - Fix bug in set ball command.
+
+* Rule bug fix:
+ - fix bug of the goal kick position
+ - fix bug of the size of penalty
+
+[0.5.9]
+This release is the candidate of RoboCup 2008. There are some
+important improvements. Firstly, the physics parameters are well
+adjusted to make the simulation more real and stabler. Secondly, the
+restrict vision perceptor is used, with which the vision range is
+limited, but more details will be seen, i.e. the head, hands and feet
+of robots can be seen. Furthermore, the soccer rule and visual
+features are improved.
+
+* Physics Parameters:
+ Some physics parameters are adjusted to make the simulation more real
+ and stabler.
+ - Joint parameters: the max force and max speed of the joint are
+ restricted, and some other parameters are modified.
+ - Ball parameters: the parameters of drag are modified.
+
+* Restrict Vision:
+ The restrict vision perceptor is installed both in nao and
+ soccerbot058. This perceptor have some restriction compared with
+ original vision perceptor. Firstly, the robots can only see object in
+ the limited angle range (both horizontal and vertical angle ranges
+ are [-60, 60] in degree). Secondly, the frequent is restricted, the
+ robot can get one vision message every 3 cycles. Furthermore, note
+ that the noise is added to the vision information.
+
+ However, the information is richer: the robot's torso, head, hands
+ and feet can be seen. The flags placed in the field can also be seen
+ (They are no visual in the screen now, but the robot can see them).
+ Four flags are placed at the field corners (the height is 0), and the
+ four flags are placed at the goal posts (the corner of the goal).
+
+* Visual:
+ - The Nao robot can be identified by team colors and numbers. You can
+ play a match with Nao robots ;-)
+ - the monitor camera can be controlled by number keys (from 1 to 7)
+
+* Soccer Rule:
+ - Field Size: the field size is 12mx8m, the center circle radius is
+1.3m, the penalty size is 1.2mx4m. More information please see
+naosoccersim.rb.
+ - Kick Off: the kicking off team can enter the center circle, and the
+ opponents will be moved away from the center circle.
+
+[0.5.8]
+ In this release, we have a simulator which is much more like the
+ RoboCup Humanoid League: The smaller size, the smaller robot and
+ ball. The integrated agent is added as a new feature. Furthermore,
+ the external monitor works now.
+
+* New Robot Models:
+ - Nao: robot from Aldebaran Robotics, see rsg/agent/nao/nao.rsg. The
+ robot looks great with textures.
+ - soccerbot058: robot based on soccerbotcomp with joint limits, and
+ its size is scaled ( default 0.1 ), see
+ rsg/agent/soccerbot058/soccerbot.rsg.
+
+* New Nao Soccer Simulation:
+ The simulator start naosoccersim.rb in default now, the new field
+ size is the same as RoboCup Standard Platform League, please see
+ naosoccersim.rb for details. The old soccersim.rb are still there,
+ you can switch between naosoccersim and soccersim in simspark.rb.
+
+* New Feature:
+ - Integrated Agent: The agent can run internally now, in this case it
+ is easier to debug the skill that you have designed, since it can get
+ the simulation information directly. Note that the action is
+ performed with a delay of one cycle (This is just like external
+ agent). There is an example in plugin/soccer/agentintegration. To run
+ the demo just enable two lines in the simspark.rb:
+ sparkSetupTrain()
+ addIntegratedAgent('SoccerbotBehavior',1)
+
+* Important Fixes:
+ - the external monitor works now, you can run to monitor remotely(set
+ $monitorServer in spark.rb). And also, the internal monitor can be
+ disabled by setting $enableInternalMonitor to false in simspark.rb.
+ - the OBJ importer is extended, we have really good 3D graphics now.
+ - joint limits: the simulation runs stably with joint limits.
+
+For details have a look into the ChangeLog coming with the package.
+
+[0.5.7]
+ This is the first release after the competition in Atlanta.
+ The simulator now contains the auto-adjust speed mode(by default),the
+ server will run slower when needed, and print warning. We also
+ applied changes what be made in Atlanta, and re-enabled the
+ communication between robots. Furthermore, we imported some new
+ features from SimSpark Project, including rsgedit, rosimporter, and
+ etc. Although they are optional, you may want to try the rsgedit,
+ please install the wxWidgets[1] firstly and take a look at the 'Quick
+ start to RsgEdit' in the doc directory. Finally, there is a new robot
+ model which is built with composite bodies for better performance.
+ The monitor logger was also bug-fixed and improved. With the help of
+ the community, the documents about the server are available now, but
+ they are still in progress.
+
+* Documents:
+ - the user's manual in doc/users
+ - the server developer's manual in doc/devel
+ - there are also some useful information at SimSpark Wiki[1]
+
+* Important fixes:
+ - mointor logger:
+ - fixed methods to work properly.
+ - solve the update problem (reported by team Apollo).
+ - remove invisible nodes to save bandwidth(thanks to Carlos
+ Bustamante from Borregos3D).
+
+* Features:
+- applied Atlanta 2007 server changes:
+ - 'm' and 'c' for killing agents
+ - two robot models with different facilities
+ - using materials with textures
+ - free kick distance changed to 4.5
+ - one half time (8 mins)
+ - agents can beam in Goal_Left or Goal_Right play modes
+ - no longer possible to move agents by pressing m
+- re-enabled communication, the soccerbot056 has SayEffector and
+ HearPerceptor
+- add AdjustSpeed mode (It is enabled by default). In this mode, the
+ server will run slower when needed.
+- new multi-threaded implementation
+- rosimporter, model importer for RoSiML[2] modeling language
+- rsgedit, a cool simspark simulator with graphic user interface.
+- soccerbotcomp, the new robot mode which is built with composite
+ bodies, it can advance the simulation speed.
+- include some useful utilities: tinyxml, wxflatnotebook and wxscintilla
+
+For details have a look into the ChangeLog coming with the package.
+
+[1] http://simspark.sourceforge.net/wiki/
+
+[2] www.wxwidgets.org
+
+[3] Laue, T., Spiess, K., Refer, T.: Simrobot - a general physical
+robot simulator and its application in robocup. In: RoboCup 2005:
+Robot Soccer World Cup IX. Lecture Notes in Artificial Intelligence,
+Springer (2006)
+
+[0.5.6]
+This is the final release for the competition in Atlanta, GA. The simulator
+now contains the new timer running in single-threaded mode by default. We also
+fixed the soccer rules plug-in (communication and offside not supported
+yet). Furthermore, we completed the game state info display in both the
+internal and external monitors, and fixed the trainer command parser to work
+with the new agents. The SoccerBot model was modified, the performance was
+slightly improved, and several bugs were fixed.
+
+* Important fixes:
+
+beameffector & singlematiniteffector:
+- fixed beaming with rotation
+
+gyrorateperceptor:
+- output is now in the local coordinate system of the robot
+
+trainercommandparser:
+- fixed several methods to work with the new agent
+
+* Features:
+
+- new GameTimePerceptor added which senses game time instead of sim time (not
+ used in Atlanta)
+- GameStatePerceptor added which provides the agent with information about the
+ current game state (play mode, game time, unum, and side)
+- play modes and rules re-integrated (no communication and no offside yet)
+- slight performance improvement by caching references to important classes
+- game state info display fixed in the internal and external monitors
+- key bindings for 7 different camera positions, kick off, and drop ball
+- the SoccerBot was modified to have a two-part torso to facilitate stand-up
+ motions, it got colliders (and very small masses) at the hands, it uses the
+ ForceResistanceReceptor instead of the TouchPerceptor
+- the hinge joint and universal joint effectors will not set any velocity if a
+ joint stop is reached to prevent large forces and instabilities (not used in Atlanta)
+- the maximum joint velocity that can be requested was restricted to 9000
+ deg/sec (for stability reasons)
+- Field size was reduced to 50m x 32m, penalty area reduced to 8m x 19.5m
+- Goal size was increased to 9m width and 4m height
+- The ball model was improved according to suggestions from wjq and Tobias Warden
+- The visualization of the corner flags was moved back to allow proper corner kicks
+
+
+[0.5.5]
+The simulator has been ported to MacOS, the network messages were shortened,
+we did some performance tuning, improved the log player, added a new perceptor,
+and fixed some bugs.
+
+* Important fixes:
+
+simspark:
+- fixed setup of goal flags (thanks Carlos)
+- several files were missing break statments in the physicsserver directory
+ (thanks Shivaram)
+
+gyrorateperceptor:
+- "rt" keyword was added to enable correct parsing of the perceptor values
+
+* Features:
+
+- MacOS compatibility (please see README.MacOS file for comments)
+- individual ODE CollisionSpaces are used to encapsulate each agent and
+ each goal now
+- the protocols for the monitor and the agents have been shortened
+- new basic importer for Wavefront OBJ files
+- textures can be enabled for the ball, the field, and the agent torso
+ (player numbers :-) )
+- several computationally expensive function calls have been replaced
+ with calls to more efficient versions
+- the log player now plays logfiles in forward and backward mode, and
+ supports pause, and forward/backward stepping
+- a new perceptor (ForceResistancePerceptor) was implemented that gives
+ feedback about position and resulting force due to a collision of the
+ body the perceptor is attached to (see doc/TEXT_INSTEAD_OF_A_MANUAL.txt
+ for details)
+- BeamEffector now takes 3 arguments: position (x and y) and angle in the
+ x-y-plane (rotation around z-axis) at the beam position (DEG)
+
+[0.5.4]
+This release contains fixes for known problems (e.g. in the
+visionperceptor or the spark sample agent), updates of old plug-ins
+for the new simulation (beameffector, initeffector), and new features
+like a log player, and new perceptors.
+
+* Important fixes:
+
+visionperceptor:
+- patch (vision6) by Yuan to fix problems related to the local
+ reference frame of the robot
+
+soccerbot:
+- anchor of the ankle joint was set higher to avoid foot penetration
+ when doing large steps (thanks Guangbin Cui)
+
+beameffector:
+- all the bodies below the parent of the effector are moved now
+ instead of only one (thanks Amin)
+
+initeffector:
+- move all the bodies below the parent of the effector to the initial position
+
+simspark:
+- increased goal height
+- reduced ball size and mass
+- internal rendering can be switched off without affecting timing now
+- support for ODE collision spaces was implemented by Markus
+- a 64-Bit compile issue was fixed (thanks Sander van Dijk)
+
+agentspark:
+- patch by snow to fix problems in the GetMessage function
+- sending init message in the SoccerBotBehavior
+
+* Features:
+
+- simspark now uses the new SingleMatInitEffector to initialize
+ agents based on their teamname (different initial position and
+ different uniform color)
+- simspark can record logfiles (thanks Hesham & Amin)
+- monitorspark can playback the recorded logfiles (thanks Hesham & Amin)
+- new gyro rate perceptor (thanks Hedayat)
+- new binary touch sensor
+
+
+[0.5.3]
+This release contains some fixes for the offside code and some
+eye candy for the lite monitor. Furthermore, it includes the new
+Fujitsu HOAP-2 inspired robot for simspark as well as the derived
+SoccerBot (work in progress), and some improvements to the physics
+code (mainly related to stability issues).
+
+* Features:
+
+- rcssmonitor3D-lite features a SkyBox (by Heni Ben Amor) and improved
+ colors and lights (by Tobias Warden). Please see the comment about
+ texture files in the INSTALL file.
+- simspark includes hoap2.rsg and soccerbot.rsg robot models
+- agent communication was restricted to a message length of 20 Bytes in
+ rcssserver3D
+
+* Important fixes:
+
+rcssmonitor3D-lite:
+- toggling pause with p (r will be used for assigning free kicks)
+- correct aspect in 2D overview
+- Mousehandling patch (by Junqing Wang)
+
+rcssserver3D:
+- several fixes for the offside rule code
+- fixed bug that prevents arguments to be passed to SPADES (by Sander van Dijk)
+
+simspark:
+- fixed bug in the sceneffector that resulted in a crash if defines were used in RSG
+ agent descriptions
+- modified several parameters of the physics system to get a more stable simulation
+- fixed the fixed joint type ;-)
+
+
+[0.5.2]
+This is mainly a bug fix release to get a stable version and change some parameters
+for the RoboCup-2006 in Bremen. Some new features, mainly in the monitor are
+introduced as well.
+
+* Features (general):
+
+- the catch margin of the catch effector has been reduced to 0.8m and the goal
+ height was increased to 1.6m to reflect the stronger goalie capabilities and
+ offside rule implications.
+- the monitor features a new autocam mode, "picture-in-picture" view, a
+ display of the current camera mode, and the ground texture can be toggled
+- logfiles can now be stepped backwards
+- agenttest was updated with a say command and sample code
+
+* Important fixes:
+
+- the calculation of the torque vector in the kickeffector was fixed
+- the parameters for the pan/tilt effector are checked for NAN
+- the list of the monitor keybindings was updated
+- a bug in offside was fixed that could occur if a player and the ball cross the
+ opponents line of defense, and this player was the last one to shot the ball
+ before crossing.
+- the code has been updated for gcc 4.1
+- some bugs relating to kickoff have been fixed
+- say effector ignores some illegal characters
+
+
+[0.5.1]
+Release 0.5.1 contains mainly two fixes:
+- the Offside rules are now closer to the FIFA rules.
+- the RestrictedVisionPerceptor (RVP) was hardly useable. The RVP
+ can now be controlled by using a PanTilt Effector.
+
+
+[0.5]
+This release introduces a few new features, and also some bugfixes
+(and probably some new bugs :). Important new features and fixes are
+as follows:
+
+* Features (soccer):
+
+- Goalies.
+ Players with uniform number '1' can catch the ball using the (catch)
+ command.
+
+- A restricted vision perceptor, so that not all other agents are
+ visible at the same time. With this perceptor, the communication
+ introduced in the 0.4 release becomes important.
+
+- The offside and some other rules have been cleaned up and some bugs
+ have been removed. Also, files that have been missing in the
+ 0.4. release are now present.
+
+- rcssmonitor3D-lite looks a little more interesting now, and
+ some bugs with the random number generators have been fixed.
+
+* Features (general):
+
+- a couple of new physics functions have been added, general simulation
+ settings have been fixed. This doesn't change the current soccer
+ simulation, but is important for the general simulator.
+
+
+[0.4]
+This release includes some speed improvements, agent communication,
+an implementation of the offside rule, and a first, unfinished version
+of the new legged-sphere agent type amongst other things.
+Here is a summary with some more details:
+
+* Features (general):
+
+- A cache for node references has been added to the Zeitgeist
+ core to speed up the simulation considerably. Thanks go to the
+ Brainstormers3D team for the initial patch and to Markus Rollmann
+ for the modification and integration.
+- The Spark based simulation (which will be used in the future for
+ simulations using the articulated agents) has been made much more
+ flexible by Markus Rollmann.
+- A sample agent and behaviors for a Spark based soccer simulation
+ using either small cars or legged-sphere agents has been
+ added. Currently, the legged-sphere agents are used by default.
+ The behavior of the agents is very simple (in the legged-sphere case)
+ and is solely meant to demonstrate how to use the new perceptors and
+ effectors.
+
+* Features (soccer):
+
+- The offside rule has been implemented by Hesham Ebrahimi
+- Agent communication is now possible. It is based on the
+ 2D communication model. Documentation can be found in the
+ file doc/TEXT_INSTEAD_OF_A_MANUAL.txt. Thanks go again to
+ Hesham Ebrahimi for the implementation and documentation
+- The lite-monitor is able to draw velocities in 2D and 3D.
+ Added by Jan Murray.
+
+* Important fixes:
+
+- Fix for gcc 4.0 and above compatibility by Jan Murray
+- An issue with 64bit builds, reported by Li Yang and Patrick Riley,
+ was fixed by Markus Rollmann
+- The distance error in the vision perceptor was made dependent on the
+ real distance by Oliver Obst
+
+[0.x.x]
+This release has been ported to OS X. Besides the normal
+requirements, it requires an X server to be installed on the machine,
+along with a glut library for X windows.
+
+[0.3]
+This release is intended to be used as official version on RoboCup 2004.
+With respect to the soccer rules, this release mainly fixes some bugs contained
+in the 0.2.2 release. New things here are both an automatic and a manual drop
+ball feature and physical goal posts.
+With respect to the simulation system itself and usability, a few keys have
+been added to the rcssmonitor3d-lite and the system shuts down automatically
+after a match is over. Printing messages is turned off by default now (can be
+changed by adding log streams from a ruby file).
+Bugs that have been fixed included some math things (like a bug in the setup of
+axis aligned bounding boxes), bugs in the use of SPADES, and in the sample
+agent communication server.
+
+[0.2.2]
+This release adds both soccer simulation specific features (like better rules
+ and an initial version of a logplayer) and general simulation features
+(almost all ODE features are supported now, and an initial version of an
+alternative simulation server as a SPADES replacement). For the 0.3 release,
+some of these new features need some polishing :-). Below a short summary of
+new features.
+
+* Features (soccer):
+
+- The rcssmonitor3D protocol has been changed to produce less redundant data.
+ Specifically, field flags will only be sent once, and information like team
+ names and scores will be sent only if they change.
+- rcssmonitor3D-lite can be used as a logplayer now. To do this, replace the
+ CommServer plugin setup in rcssserver3D-lite.rb by the LogfileServer setup.
+ Monitor logfiles get recorded by SPADES automatically, and the new monitor
+ protocol can be used as Logfile format.
+- The rcssmonitor3D - library got an user-friendly interface.
+- rcssmonitor3D-lite looks better now and the display is more informative.
+- The body and effector parameters have been changed based on suggestions from
+ the mailing lists.
+- A trainercommandparser has been added so that it is possible to use soccer
+ monitor applications as trainer program (to repoduce specific situations etc).
+- Players are moved away from the ball in certain situations (like kick in for
+ the other team or kick off, etc).
+- It is possible to do automatic kick offs now (in rcssserver3D.rb).
+- Due to various improvements and changes, the simulator is now reasonable fast
+ to extend the half time length to 4 minutes; suggestions for the competition
+ match lenght are welcome.
+- Players accelerate (and break) faster; something like air resistance or
+ friction w...
[truncated message content] |
|
From: <he...@us...> - 2009-02-10 23:53:25
|
Revision: 47
http://simspark.svn.sourceforge.net/simspark/?rev=47&view=rev
Author: hedayat
Date: 2009-02-10 23:53:23 +0000 (Tue, 10 Feb 2009)
Log Message:
-----------
Rcssserver3d 0.6.1 release
Added Paths:
-----------
tags/RCSSSERVER3D_0.6.1_RELEASE/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-02-10 23:36:51
|
Revision: 46
http://simspark.svn.sourceforge.net/simspark/?rev=46&view=rev
Author: hedayat
Date: 2009-02-10 23:36:42 +0000 (Tue, 10 Feb 2009)
Log Message:
-----------
Simspark 0.1 Release
Added Paths:
-----------
tags/SIMSPARK_0.1_RELEASE/spark/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-02-10 23:36:01
|
Revision: 45
http://simspark.svn.sourceforge.net/simspark/?rev=45&view=rev
Author: hedayat
Date: 2009-02-10 23:35:55 +0000 (Tue, 10 Feb 2009)
Log Message:
-----------
Simspark 0.1 Release
Added Paths:
-----------
tags/
tags/SIMSPARK_0.1_RELEASE/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-02-10 23:20:23
|
Revision: 44
http://simspark.svn.sourceforge.net/simspark/?rev=44&view=rev
Author: hedayat
Date: 2009-02-10 23:20:20 +0000 (Tue, 10 Feb 2009)
Log Message:
-----------
Small fixes in users manual:
- Removed some unnecessary build requirements
- Fixed svn checkout command
- Fixed hear perceptor's message length
Modified Paths:
--------------
trunk/rcssserver3d/doc/users/gettingstarted.tex
trunk/rcssserver3d/doc/users/simspark.tex
Modified: trunk/rcssserver3d/doc/users/gettingstarted.tex
===================================================================
--- trunk/rcssserver3d/doc/users/gettingstarted.tex 2009-02-09 17:19:01 UTC (rev 43)
+++ trunk/rcssserver3d/doc/users/gettingstarted.tex 2009-02-10 23:20:20 UTC (rev 44)
@@ -51,7 +51,6 @@
\item Ruby
\item The Open Dynamics Engine (ODE)
\item The boost C++ libraries
-\item S-Lang (libslang)
\end{enumerate}
The rendering of SimSpark can be omitted from the build process
@@ -59,7 +58,6 @@
\begin{enumerate}
\item OpenGL
-\item FreeGlut
\item SDL
\item Freetype
\item Developer Image Library (DevIL)
@@ -74,7 +72,7 @@
sourceforge.net. In order to build the source first download the
current version, this is called \texttt{check out} in SVN terminology:
-\texttt{\$ svn co https://simspark.svn.sourceforge.net/svnroot/simspark sserver}
+\texttt{\$ svn co https://simspark.svn.sourceforge.net/svnroot/simspark simspark}
Downloaded package contains following packages:
\begin{itemize}
Modified: trunk/rcssserver3d/doc/users/simspark.tex
===================================================================
--- trunk/rcssserver3d/doc/users/simspark.tex 2009-02-09 17:19:01 UTC (rev 43)
+++ trunk/rcssserver3d/doc/users/simspark.tex 2009-02-10 23:20:20 UTC (rev 44)
@@ -283,7 +283,7 @@
The hear perceptor comes up with some restrictions:
\begin{enumerate}
- \item Messages are restricted to a \emph{maximal length} (currently 8 bytes).
+ \item Messages are restricted to a \emph{maximal length} (currently 20 bytes).
\item Messages shouted from beyond a \emph{maximal distance} (currently $50.0$ meters) cannot be heard.
\item The \emph{number of messages} which can be heard at the same time is
bounded: Each player has the maximal capacity of one heard message by a
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2009-02-09 17:19:05
|
Revision: 43
http://simspark.svn.sourceforge.net/simspark/?rev=43&view=rev
Author: hedayat
Date: 2009-02-09 17:19:01 +0000 (Mon, 09 Feb 2009)
Log Message:
-----------
Updated documentation:
- Say effector limit is 20 characters
- Updated RestrictedVisionPerceptor parameters
- minotorspark -> rcssmonitor3d
- Added information about renames of agentspark and monitorspark to NEWS and RELEASE
Modified Paths:
--------------
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/NEWS
trunk/rcssserver3d/RELEASE
trunk/rcssserver3d/doc/TEXT_INSTEAD_OF_A_MANUAL.txt
trunk/rcssserver3d/doc/users/CMakeLists.txt
trunk/rcssserver3d/doc/users/definitions.tex
trunk/rcssserver3d/doc/users/gettingstarted.tex
trunk/rcssserver3d/doc/users/introduction.tex
trunk/rcssserver3d/doc/users/simspark.tex
trunk/rcssserver3d/doc/users/user-manual.tex
Added Paths:
-----------
trunk/rcssserver3d/doc/users/rcssmonitor3d.tex
Removed Paths:
-------------
trunk/rcssserver3d/doc/users/monitorspark.tex
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-02-08 00:25:53 UTC (rev 42)
+++ trunk/rcssserver3d/ChangeLog 2009-02-09 17:19:01 UTC (rev 43)
@@ -1,3 +1,17 @@
+2009-02-09 Hedayat Vatankhah <he...@gr...>
+
+ * doc/users/user-manual.tex:
+ * doc/users/simspark.tex:
+ * doc/users/rcssmonitor3d.tex:
+ * doc/users/introduction.tex:
+ * doc/users/gettingstarted.tex:
+ * doc/users/definitions.tex:
+ * doc/users/CMakeLists.txt:
+ * doc/TEXT_INSTEAD_OF_A_MANUAL.txt:
+ - monitorspark -> rcssmonitor3d
+ - Say effector message lenght limit is 20 characters now
+ - Updated some info about RestrictedVisionPerceptor
+
2009-01-29 Hedayat Vatankhah <he...@gr...>
* INSTALL:
Modified: trunk/rcssserver3d/NEWS
===================================================================
--- trunk/rcssserver3d/NEWS 2009-02-08 00:25:53 UTC (rev 42)
+++ trunk/rcssserver3d/NEWS 2009-02-09 17:19:01 UTC (rev 43)
@@ -16,6 +16,10 @@
- You'll need CMake 2.6 to configure and build the package
- this package depends on simspark package, so you should install it first
+* New program names:
+ - agentspark is now called rcssagent3d
+ - monitorspark is now called rcssmonitor3d
+
* Some small enhancements and bug fixes
[0.6]
Modified: trunk/rcssserver3d/RELEASE
===================================================================
--- trunk/rcssserver3d/RELEASE 2009-02-08 00:25:53 UTC (rev 42)
+++ trunk/rcssserver3d/RELEASE 2009-02-09 17:19:01 UTC (rev 43)
@@ -17,6 +17,10 @@
- You'll need CMake 2.6 to configure and build the package
- this package depends on simspark package, so you should install it first
+* New program names:
+ - agentspark is now called rcssagent3d
+ - monitorspark is now called rcssmonitor3d
+
* Some small enhancements and bug fixes
For details have a look into the ChangeLog coming with the package. (But some
Modified: trunk/rcssserver3d/doc/TEXT_INSTEAD_OF_A_MANUAL.txt
===================================================================
--- trunk/rcssserver3d/doc/TEXT_INSTEAD_OF_A_MANUAL.txt 2009-02-08 00:25:53 UTC (rev 42)
+++ trunk/rcssserver3d/doc/TEXT_INSTEAD_OF_A_MANUAL.txt 2009-02-09 17:19:01 UTC (rev 43)
@@ -310,7 +310,7 @@
-------------------
To broadcast messages to other players, you have to use the
-SayEffector. Messages can be sayMsgSize(for now 512) characters long,
+SayEffector. Messages can be sayMsgSize(for now 20) characters long,
where valid characters for say messages are the printing characters*
except space and (). Messages players say can be heard within a
distance of audioCutDist(for now 50 meters) by members of both
@@ -344,8 +344,7 @@
software attached :). If using the regular visionperceptor, Robots
have a 360 degrees view. With the RestrictedVisionPerceptor (which
became the default in version 0.5), the view field of the robot is
-restricted to 90 degrees (this is of course configurable in
-rcssserver3D.rb). The direction of the view (pan and tilt) can be
+restricted to 120 degrees (for Nao). The direction of the view (pan and tilt) can be
changed with the pantilt effector. The camera can pan to any angle
(the initial 0 degrees pan direction is the direction towards the
opponent side), and tilt around the horizontal plane.
@@ -376,7 +375,7 @@
complete match.
- Dynamic noise normally distributed around 0.0
- + distance error: sigma = 0.0965
+ + distance error: sigma = 0.0965 (also, distance error is multiplied by distance/100)
+ angle error (x-y plane): sigma = 0.1225
+ angle error (latitudal): sigma = 0.1480
Modified: trunk/rcssserver3d/doc/users/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/doc/users/CMakeLists.txt 2009-02-08 00:25:53 UTC (rev 42)
+++ trunk/rcssserver3d/doc/users/CMakeLists.txt 2009-02-09 17:19:01 UTC (rev 43)
@@ -4,7 +4,7 @@
if (PDFLATEX_COMPILER)
include(../../cmake/UseLATEX.cmake)
add_latex_document(user-manual.tex INPUTS rcssagent3d.tex gettingstarted.tex
- robots.tex introduction.tex monitorspark.tex simspark.tex license.tex
+ robots.tex introduction.tex rcssmonitor3d.tex simspark.tex license.tex
overview.tex simulations.tex definitions.tex resources.tex user-manual.tex
BIBFILES references.bib IMAGE_DIRS fig DEFAULT_PDF)
endif (PDFLATEX_COMPILER)
Modified: trunk/rcssserver3d/doc/users/definitions.tex
===================================================================
--- trunk/rcssserver3d/doc/users/definitions.tex 2009-02-08 00:25:53 UTC (rev 42)
+++ trunk/rcssserver3d/doc/users/definitions.tex 2009-02-09 17:19:01 UTC (rev 43)
@@ -107,8 +107,9 @@
Klaus Dorer\\%
Markus Rollmann\\%
Yuan Xu\\%
- Feng Xue\\%
- Marian Buchta\\%
+ Feng Xue\\%
+ Marian Buchta\\%
+ Hedayat Vatankhah\\%
}
}
\end{minipage}
@@ -117,7 +118,7 @@
\textsf{\Large\flushright{Version 1.2}}
\end{minipage}
- \vspace{-3cm}
+ \vspace{-4cm}
\begin{minipage}[t]{\linewidth}
\hspace*{2.25cm}
Modified: trunk/rcssserver3d/doc/users/gettingstarted.tex
===================================================================
--- trunk/rcssserver3d/doc/users/gettingstarted.tex 2009-02-08 00:25:53 UTC (rev 42)
+++ trunk/rcssserver3d/doc/users/gettingstarted.tex 2009-02-09 17:19:01 UTC (rev 43)
@@ -88,7 +88,7 @@
simspark core package like:
\begin{itemize}
\item Gendot: generates a graphviz dot file showing the zeitgeist class hierarchy, including all classes that are visible at runtime
-\item Monitorspark: external monitor implementation. Please refer to chapter \ref{cha:monitorspark}
+\item Monitorspark: external monitor implementation.
\item Sampleagent: sample of simple behaviour implementation
\item Samplesim: sample of simple simulation
\end{itemize}
@@ -235,7 +235,7 @@
The monitor is a separate application that connects to the server and
displays the simulated scene. To start the default monitor type
-\texttt{monitorspark}. By default the monitor is configured to connect to a simulation
+\texttt{rcssmonitor3d}. By default the monitor is configured to connect to a simulation
on the local machine. You can however run the server and monitor on
different machines.
@@ -255,7 +255,7 @@
After the monitor started you are able to use the mouse and keyboard
to navigate the scene. Please refer to chapter
-\ref{cha:monitorspark} for a complete list of the available key bindings.
+\ref{cha:rcssmonitor3d} for a complete list of the available key bindings.
You can use the numbers of the keypad to navigate to different
positions on the playing field. The view after pressing \texttt{3} is
@@ -325,7 +325,7 @@
\end{itemize}
-%I think for the initial outline of the manual it's easier to just focus on either app/simpark app/monitorspark or rsgedit.
+%I think for the initial outline of the manual it's easier to just focus on either app/simpark app/rcssmonitor3d or rsgedit.
%%% Local Variables:
%%% mode: latex
Modified: trunk/rcssserver3d/doc/users/introduction.tex
===================================================================
--- trunk/rcssserver3d/doc/users/introduction.tex 2009-02-08 00:25:53 UTC (rev 42)
+++ trunk/rcssserver3d/doc/users/introduction.tex 2009-02-09 17:19:01 UTC (rev 43)
@@ -101,7 +101,7 @@
to the agent and vice versa. These messages contain information about
agent percepts and agent command strings.
-In chapter \ref{cha:monitorspark} we give an overview about the
+In chapter \ref{cha:rcssmonitor3d} we give an overview about the
available monitor and log player setups. Their configuration and usage
is described in detail there.
Deleted: trunk/rcssserver3d/doc/users/monitorspark.tex
===================================================================
--- trunk/rcssserver3d/doc/users/monitorspark.tex 2009-02-08 00:25:53 UTC (rev 42)
+++ trunk/rcssserver3d/doc/users/monitorspark.tex 2009-02-09 17:19:01 UTC (rev 43)
@@ -1,89 +0,0 @@
-\chapter{Monitorspark}
-\label{cha:monitorspark}
-
-This chapter gives an overview about the available monitor and log
-player setups available in SimSpark, their configuration and usage.
-
-\section{Internal Monitor}
-
-The internal monitor implementation is part of the SimSpark server. It
-is enabled in the \texttt{simspark.rb} setup script by enabling the
-rendering and input plugins of the server. To do so please uncomment
-the lines \texttt{sparkSetupRendering()} and
-\texttt{sparkSetupInput()}, i.e. remove the leading \texttt{'\#'} comment markers.
-
-\section{External Monitor}
-
-The external monitor implementation is called
-\texttt{monitorspark}. It either connects to a running SimSpark
-instance or replays a simulation run from a log file.
-
-\section{Playing Log files}
-
-The monitor is able to replay a simulation that is recorded in a log
-file. It accepts a \texttt{--logfile} parameter on its command line
-that enables the log player mode.
-
-\section{Key Assignments}
-
-The monitor accepts a number of commands by key or mouse. These
-commands either control the movement of the camera or send commands
-back to the server to control the simulation. The soccer simulation
-uses these commands to implement the controls for the human referee.
-
-\begin{table}
-\label {table:monitorspark}
-\caption{Key assignments for monitorspark}
-\begin{center}
-\begin{tabular}{|l|l|}
-{\bf key} & {\bf function} \\
-\hline
-q & quit monitor \\
-\hline
-left mouse button & mouse look \\
-right mouse button & move camera up \\
-keypad plus & move camera up \\
-pageup & move camera up \\
-pagedown & move camera down \\
-keypad minus & move camera down \\
-a & move camera left \\
-left arrow & move camera left \\
-d & move camera right \\
-right arrow & move camera right \\
-w & move camera forward \\
-up arrow & move camera forward \\
-s & move camera backward \\
-down arrow & move camera backward \\
-\hline
-1 & camera to left goal \\
-2 & camera to left corner \\
-3 & camera to middle left \\
-4 & camera to middle right \\
-5 & camera to middle \\
-6 & camera to right corner \\
-7 & camera to right goal \\
-\hline
-l & free kick left \\
-r & free kick right \\
-k & kick off \\
-b & drop ball \\
-m & move agent \\
-n & shoot ball \\
-x & move ball \\
-\hline
-p & pause the playback of a log file \\
-f & move forward in the log file \\
-b & move backwards in the log file \\
-l & playback the log file \\
-\hline
-\end{tabular}
-\end{center}
-\end{table}
-
-The list of accepted default command short cuts is given in table
-\ref{table:monitorspark}. These short cuts are configured in the two setup
-scripts \texttt{bindings.rb} and \texttt{soccerbindings.rb} that the
-SimSpark monitor reads on start up.
-
- %%% Local Variables: %%% mode: latex %%% TeX-master:
-"user-manual" %%% End:
Copied: trunk/rcssserver3d/doc/users/rcssmonitor3d.tex (from rev 42, trunk/rcssserver3d/doc/users/monitorspark.tex)
===================================================================
--- trunk/rcssserver3d/doc/users/rcssmonitor3d.tex (rev 0)
+++ trunk/rcssserver3d/doc/users/rcssmonitor3d.tex 2009-02-09 17:19:01 UTC (rev 43)
@@ -0,0 +1,89 @@
+\chapter{Rcssmonitor3d}
+\label{cha:rcssmonitor3d}
+
+This chapter gives an overview about the available monitor and log
+player setups available in SimSpark, their configuration and usage.
+
+\section{Internal Monitor}
+
+The internal monitor implementation is part of the SimSpark server. It
+is enabled in the \texttt{simspark.rb} setup script by enabling the
+rendering and input plugins of the server. To do so please uncomment
+the lines \texttt{sparkSetupRendering()} and
+\texttt{sparkSetupInput()}, i.e. remove the leading \texttt{'\#'} comment markers.
+
+\section{External Monitor}
+
+The external monitor implementation is called
+\texttt{rcssmonitor3d}. It either connects to a running SimSpark
+instance or replays a simulation run from a log file.
+
+\section{Playing Log files}
+
+The monitor is able to replay a simulation that is recorded in a log
+file. It accepts a \texttt{--logfile} parameter on its command line
+that enables the log player mode.
+
+\section{Key Assignments}
+
+The monitor accepts a number of commands by key or mouse. These
+commands either control the movement of the camera or send commands
+back to the server to control the simulation. The soccer simulation
+uses these commands to implement the controls for the human referee.
+
+\begin{table}
+\label {table:rcssmonitor3d}
+\caption{Key assignments for rcssmonitor3d}
+\begin{center}
+\begin{tabular}{|l|l|}
+{\bf key} & {\bf function} \\
+\hline
+q & quit monitor \\
+\hline
+left mouse button & mouse look \\
+right mouse button & move camera up \\
+keypad plus & move camera up \\
+pageup & move camera up \\
+pagedown & move camera down \\
+keypad minus & move camera down \\
+a & move camera left \\
+left arrow & move camera left \\
+d & move camera right \\
+right arrow & move camera right \\
+w & move camera forward \\
+up arrow & move camera forward \\
+s & move camera backward \\
+down arrow & move camera backward \\
+\hline
+1 & camera to left goal \\
+2 & camera to left corner \\
+3 & camera to middle left \\
+4 & camera to middle right \\
+5 & camera to middle \\
+6 & camera to right corner \\
+7 & camera to right goal \\
+\hline
+l & free kick left \\
+r & free kick right \\
+k & kick off \\
+b & drop ball \\
+m & move agent \\
+n & shoot ball \\
+x & move ball \\
+\hline
+p & pause the playback of a log file \\
+f & move forward in the log file \\
+b & move backwards in the log file \\
+l & playback the log file \\
+\hline
+\end{tabular}
+\end{center}
+\end{table}
+
+The list of accepted default command short cuts is given in table
+\ref{table:rcssmonitor3d}. These short cuts are configured in the two setup
+scripts \texttt{bindings.rb} and \texttt{soccerbindings.rb} that the
+SimSpark monitor reads on start up.
+
+ %%% Local Variables: %%% mode: latex %%% TeX-master:
+"user-manual" %%% End:
Modified: trunk/rcssserver3d/doc/users/simspark.tex
===================================================================
--- trunk/rcssserver3d/doc/users/simspark.tex 2009-02-08 00:25:53 UTC (rev 42)
+++ trunk/rcssserver3d/doc/users/simspark.tex 2009-02-09 17:19:01 UTC (rev 43)
@@ -154,8 +154,7 @@
software attached :). If using the regular visionperceptor, Robots
have a 360 degrees view. With the RestrictedVisionPerceptor (which
became the default in version 0.5), the view field of the robot is
-restricted to 90 degrees (this is of course configurable in
-rcssserver3D.rb). The direction of the view (pan and tilt) can be
+restricted to 120 degrees (for Nao robot). The direction of the view (pan and tilt) can be
changed with the pantilt effector. The camera can pan to any angle
(the initial 0 degrees pan direction is the direction towards the
opponent side), and tilt around the horizontal plane.
@@ -196,9 +195,9 @@
axis, the error is uniformly distributed between -0.005 m and 0.005 m. The
error is calculated once and remains constant during the complete match.
\item Dynamic noise normally distributed around 0.0
- + distance error: sigma = 0.0965
- + angle error (x-y plane): sigma = 0.1225
- + angle error (latitudal): sigma = 0.1480
+ \subitem + distance error: sigma = 0.0965 (also, distance error is multiplied by distance/100)
+ \subitem + angle error (x-y plane): sigma = 0.1225
+ \subitem + angle error (latitudal): sigma = 0.1480
\end{itemize}
A vision message is started with See followed by the visible objects.
@@ -225,6 +224,7 @@
% The current soccer bot seems not to use it, still experimental/unsupported?
% Joschka: I'm not sure either. Oliver worked on that, and Yuan had several patches for it last year. Maybe Yuan has the best overview right now? The current Soccerbot doesn't use it.
+% Hedayat: Currently Nao robot uses this perceptor.
\subsubsection{GameState Perceptor}
\label{sec:gamestateperceptor}
@@ -405,7 +405,7 @@
\label{sec:sayeffector}
%klaus: is this old version only?
-%Joschka: no, the Soccerbot has a say effector in the current version. It is restricted to 8 bytes msgs.
+%Joschka: no, the Soccerbot has a say effector in the current version. It is restricted to 20 bytes msgs.
%description in TEXT_INSTEAD_... and Philipp Vorst's thesis
The \emph{say effector} permits communication among agents by broadcasting
messages. In order to say something, the following command has to be employed:
@@ -413,7 +413,7 @@
\item[Message format:] \texttt{(say <message>)}
\item[Example message:] \texttt{(say ``helloworld'')}
\end{itemize}
-$Message$ may consist of 8 characters, which may be taken from the ASCII
+$Message$ may consist of 20 characters, which may be taken from the ASCII
printing character subset $[{\tt 0x20}, {\tt 0x7E]}$ except the {\it white
space} character ($\sqcup$) and the normal brackets {\tt(} and {\tt )}.
For details and restrictions please see Section~\ref{sec:hearperceptor}, about
Modified: trunk/rcssserver3d/doc/users/user-manual.tex
===================================================================
--- trunk/rcssserver3d/doc/users/user-manual.tex 2009-02-08 00:25:53 UTC (rev 42)
+++ trunk/rcssserver3d/doc/users/user-manual.tex 2009-02-09 17:19:01 UTC (rev 43)
@@ -1,7 +1,7 @@
\include{definitions}
\author{Joschka Boedecker \\ Klaus Dorer \\ Markus Rollmann \\ Yuan Xu
-\\ Feng Xue \\ Marian Buchta}
+\\ Feng Xue \\ Marian Buchta \\ Hedayat Vatankhah}
\title{Simspark User Manual}
\date{February 2009}
@@ -25,7 +25,7 @@
\input{overview}
\input{gettingstarted}
\input{simspark}
-\input{monitorspark}
+\input{rcssmonitor3d}
\input{rcssagent3d}
\input{simulations}
\input{robots}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2009-02-08 00:25:57
|
Revision: 42
http://simspark.svn.sourceforge.net/simspark/?rev=42&view=rev
Author: marianbuchta
Date: 2009-02-08 00:25:53 +0000 (Sun, 08 Feb 2009)
Log Message:
-----------
Update SimSpark User's Manual
Modified Paths:
--------------
trunk/rcssserver3d/doc/users/CMakeLists.txt
trunk/rcssserver3d/doc/users/definitions.tex
trunk/rcssserver3d/doc/users/gettingstarted.tex
trunk/rcssserver3d/doc/users/introduction.tex
trunk/rcssserver3d/doc/users/overview.tex
trunk/rcssserver3d/doc/users/resources.tex
trunk/rcssserver3d/doc/users/robots.tex
trunk/rcssserver3d/doc/users/simspark.tex
trunk/rcssserver3d/doc/users/simulations.tex
trunk/rcssserver3d/doc/users/user-manual.tex
Added Paths:
-----------
trunk/rcssserver3d/doc/users/rcssagent3d.tex
Removed Paths:
-------------
trunk/rcssserver3d/doc/users/agentspark.tex
Modified: trunk/rcssserver3d/doc/users/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/doc/users/CMakeLists.txt 2009-02-06 02:05:26 UTC (rev 41)
+++ trunk/rcssserver3d/doc/users/CMakeLists.txt 2009-02-08 00:25:53 UTC (rev 42)
@@ -3,7 +3,7 @@
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/user-manual.tex)
if (PDFLATEX_COMPILER)
include(../../cmake/UseLATEX.cmake)
- add_latex_document(user-manual.tex INPUTS agentspark.tex gettingstarted.tex
+ add_latex_document(user-manual.tex INPUTS rcssagent3d.tex gettingstarted.tex
robots.tex introduction.tex monitorspark.tex simspark.tex license.tex
overview.tex simulations.tex definitions.tex resources.tex user-manual.tex
BIBFILES references.bib IMAGE_DIRS fig DEFAULT_PDF)
Deleted: trunk/rcssserver3d/doc/users/agentspark.tex
===================================================================
--- trunk/rcssserver3d/doc/users/agentspark.tex 2009-02-06 02:05:26 UTC (rev 41)
+++ trunk/rcssserver3d/doc/users/agentspark.tex 2009-02-08 00:25:53 UTC (rev 42)
@@ -1,47 +0,0 @@
-\chapter{Agentspark}
-\label{cha:agentspark}
-
-This chapter introduces AgentSpark, the demo agent implementation
-available for SimSpark.
-
-\section{Behaviors}
-
-AgentSpark is a demo agent implementation for use with the SimSpark
-server. It serves as a testbed for agent implementation. It implements
-all low level details of connecting and communicating with the
-server. It further implements an abstract run loop. The behavior of
-this agent skeleton is implemented using plugins. On of these plugins
-is configured and installed at run time.
-
-\subsection{SoccerbotBehavior}
-
-The \texttt{SoccerbotBehavior} is a minimal example of an agent that
-acts on a soccer field and controls our current humanoid soccer bot
-model. It demonstrates reading preceptor values and controlling the
-robot with the installed effectors in a control loop. The implemented
-behavior resembles the classic \texttt{hello world} program in a
-way. It moves up the arms of the robot and repeatedly waves hello.
-
-\section{How to change Behaviors?}
-
-The different Behaviors of AgentSpark are encapsulated in classes
-that derive from the \texttt{Behavior} class. Classes of this type
-implement an interface with two functions that each return a command
-string that is then send to the SimSpark server.
-
-The first implemented function is \texttt{Init}. This function is
-called once when the agent initially connected to the server. It is
-typically used to construct the agent representation in the server
-with the help of the \texttt{scene} effector and to move the agent to
-a suitable start position in the simulation.
-
-The second implemented function is called \texttt{Think}. This
-function is called every simulation cycle. As a parameter it receives
-the sensor data as reported from the server in the last cycle. This
-function should implements the main behavior run loop of each
-agent.
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: "user-manual"
-%%% End:
Modified: trunk/rcssserver3d/doc/users/definitions.tex
===================================================================
--- trunk/rcssserver3d/doc/users/definitions.tex 2009-02-06 02:05:26 UTC (rev 41)
+++ trunk/rcssserver3d/doc/users/definitions.tex 2009-02-08 00:25:53 UTC (rev 42)
@@ -108,15 +108,16 @@
Markus Rollmann\\%
Yuan Xu\\%
Feng Xue\\%
+ Marian Buchta\\%
}
}
\end{minipage}
\hspace*{6cm}
\begin{minipage}[t]{0.5\linewidth}
- \textsf{\Large\flushright{Version 1.1}}
+ \textsf{\Large\flushright{Version 1.2}}
\end{minipage}
- \vspace{-2.5cm}
+ \vspace{-3cm}
\begin{minipage}[t]{\linewidth}
\hspace*{2.25cm}
@@ -126,7 +127,7 @@
\vspace*{-0.25cm}
\hspace*{-3cm}%
\begin{minipage}[b]{3cm}
- \textsf{\Large\flushleft{June 2008}}
+ \textsf{\Large\flushleft{February 2009}}
\end{minipage}
\end{titlepage}%
Modified: trunk/rcssserver3d/doc/users/gettingstarted.tex
===================================================================
--- trunk/rcssserver3d/doc/users/gettingstarted.tex 2009-02-06 02:05:26 UTC (rev 41)
+++ trunk/rcssserver3d/doc/users/gettingstarted.tex 2009-02-08 00:25:53 UTC (rev 42)
@@ -5,14 +5,12 @@
\section{Download and Installation Instructions}
\label{section:install}
-%Currently the soccer3d CVS builds only for Linux (the Win32 build system is not yet ported/tested, so we should focus on *nix systems.
+%Currently the simspark SVN builds only for Linux (the Win32 build system is not yet ported/tested, so we should focus on *nix systems.
-This chapter explains how to install SimSpark on an Ubuntu Linux
-system\footnote{This guide is adapted from the guide created by the
-Little Green Bats Team at
-\url{http://www.littlegreenbats.nl/?q=node/70}}. It should work with
+This chapter explains how to install SimSpark on an Ubuntu Linux. It should work with
slight modifications on other distributions like Fedora, Suse and
-especially Debian.
+especially Debian system\footnote{For more guides please visit Simspark Wiki:
+\url{http://simspark.sourceforge.net/wiki/index.php/Installation_on_Linux}}.
\begin{enumerate}
@@ -22,8 +20,7 @@
enable additional repositories in order to install all required
packages. Please refer to your system specific documentation for
details. In Ubuntu Linux these repositories are called
-\texttt{Universe} and
-\texttt{Multiverse}
+\texttt{Universe} and \texttt{Multiverse}.
To enable them you have to edit the \texttt{/etc/apt/sources.list}
file and update the local package database.
@@ -46,15 +43,8 @@
\item Install dependencies
SimSpark builds and depends upon the work of other software
-projects. We use the Gnu autotools to configure and build
-SimSpark. Therefore these packages are required:
-
-\begin{enumerate}
-\item autoconf
-\item automake
-\item libtool
-\end{enumerate}
-
+projects. We use the CMake to configure and build
+SimSpark.
Further required packages are:
\begin{enumerate}
@@ -76,79 +66,77 @@
\item Tiff library (libtiff)
\end{enumerate}
-In order to build the SimSpark documentation you need a Latex
-installation (e.g. \texttt{tetex}).
+\texttt{\$ sudo apt-get install g++ subversion cmake libfreetype6-dev libode0-dev libsdl-dev ruby1.8 ruby1.8-dev libdevil-dev libboost-dev libboost-thread-dev libboost-regex-dev}
-If you want to build the rsgedit gui you need to install
-\texttt{wxWidgets}. The following commands download and installed the required packages:
+\item Check out the source from the source forge SVN repository
-\texttt{\$ sudo apt-get install g++ ruby1.9 ruby1.9-dev libode0-dev\
-libboost-dev libsdl-dev libfreetype6-dev libdevil-dev autoconf\
-automake1.9 libtool freeglut3-dev tetex-extra cvs xlibs-dev\
-libtiff4-dev libslang1-dev}
-
-\texttt{\$ sudo rm /usr/bin/ruby}
-
-
-\texttt{\$ sudo ln -s /usr/bin/ruby1.9 /usr/bin/ruby}
-
-
-\texttt{\$ sudo ln -s /usr/lib/libruby1.9.so /usr/lib/libruby.so}
-
-\item Check out the source from the source forge CVS repository
-
-The SimSpark source is hosted in a CVS repository at
+The SimSpark source is hosted in a SVN repository at
sourceforge.net. In order to build the source first download the
-current version, this is called \texttt{check out} in CVS terminology:
+current version, this is called \texttt{check out} in SVN terminology:
-\texttt{\$ cvs -d:pserver:ano...@ss...:/cvsroot/sserver login}
+\texttt{\$ svn co https://simspark.svn.sourceforge.net/svnroot/simspark sserver}
+Downloaded package contains following packages:
+\begin{itemize}
+\item Simspark: this package contains the core simulation engine and
+can be used to create different kinds of simulation. It is not soccer
+specific
+\item Rcssserver3D: implements soccer simulation 3d on top of simspark
+engine. This package depends on simspark package
+\item Rsgedit: simspark simulator with graphics user interface
+\item Simspark utilities: it'll contain some additional tools for
+simspark core package like:
+\begin{itemize}
+\item Gendot: generates a graphviz dot file showing the zeitgeist class hierarchy, including all classes that are visible at runtime
+\item Monitorspark: external monitor implementation. Please refer to chapter \ref{cha:monitorspark}
+\item Sampleagent: sample of simple behaviour implementation
+\item Samplesim: sample of simple simulation
+\end{itemize}
+\end{itemize}
-When you get asked for a password, just press enter.
+\item Configure, generate build files and install the soccer server
+You can build this packages using CMake build system (version 2.6 or higher
+should be installed on your system). CMake can generate different kinds of
+native build files for your system (e.g. Unix Makefiles, Eclipse CDT 4.0 project
+files, Visual Studio project files). You can generate build files using CMake
+command-line or GUI interfaces.
-\texttt{\$ cvs -z3 -d:pserver:ano...@ss...:/cvsroot/sserver co -P rcsoccersim/rcssserver3D}
-
-
-\item Build and install the soccer server
-
-The automake build tools use a \texttt{configure} script that adapts
-the build process to your system allows you to customize it. The
-configure script accepts a number of options that you can add to it's
+The configure \texttt{cmake} accepts a number of options that you can add to it's
command line:
\begin{enumerate}
\item \texttt{--help} lists all available configure options. There are some more available
-that would exceed the scope of this manual
+that would exceed the scope of this manual. Note: The list of all available generator for your OS platform are at the end of printout.
-\item \texttt{--enable-debug=no} builds an optimized version of SimSpark
-that contains no debug symbols
+\item \texttt{--G <generator-name>} specify a makefile generator.
-\item \texttt{--enable-kerosin=no} builds SimSpark without rendering support
+\item \texttt{-DCMAKE\_INSTALL\_PREFIX:PATH=/some/path}
+defines the path where the \texttt{make install} will later install the SimSpark executable and resources into your system. If omitted it defaults to /usr/local/lib
-\item \texttt{--prefix=/some/path} defines the path where the \texttt{make install} will later
-install the SimSpark executable, plugins and resources into your
-system. If omitted it defaults to /usr/local
-
\end{enumerate}
-Change in to the top level source directory call the bootstrap script
-that invokes the autotools, run configure with your custom options,
-start the build process and install the server into your system.
+Every package has the same installation procedure. Change in to the top level package directory (spark, rcssserver3D etc.). We recommend to create a directory to hold your build files. Change directory to the directory you created in the previous, run cmake build system, start the build process and install the server into your system.
-\texttt{\$ cd rcsoccersim/rcssserver3D/}
+For soccer simulation, you'll need at least simspark (build at first) and rcssserver3d packages. Other packages are optional (Rsgedit and Simspark-utilities).
-\texttt{\$ ./bootstrap}
+\texttt{\$ cd sserver/trunk/spark/}
-\texttt{\$ ./configure}
+\texttt{\$ mkdir build}
+\texttt{\$ cd build}
+
+\texttt{\$ cmake ..}
+
+Note: Optionally, now you can run \texttt{ccmake .} to edit the build settings (for example the installation directory).
+
\texttt{\$ make}
\texttt{\$ sudo make install}
\item Make sure the linker can find your shared libraries if you changed
-the install prefix as described above with the \texttt{--prefix}
+the install prefix as described above with the \texttt{-DCMAKE\_INSTALL\_PREFIX:PATH}
option.
\texttt{\$ sudo gedit /etc/ld.so.conf}
@@ -157,12 +145,43 @@
\texttt{\$ sudo ldconfig}
-\item run the simulation
+\item Run the simulation
-{\texttt{\$ cd}}
+\texttt{\$ simspark}
-{\texttt{\$ simspark}}
+\item Optionally
+\begin{itemize}
+\item Documentation
+
+After creating build files, there will be two extra targets (if you have their requirements): doc and pdf. If you want to create API documentation (using doxygen) you can run \texttt{make doc} .
+
+\texttt{\$ sudo apt-get install doxygen}
+\texttt{\$ sudo ldconfig}
+
+\texttt{\$ make doc}
+
+To create PDF documentation, run \texttt{make pdf}.
+
+\texttt{\$ sudo apt-get install tetex-extra latex2html imagemagick}
+\texttt{\$ sudo ldconfig}
+
+\texttt{\$ make pdf}
+
+\item Rsgedit
+
+Before build the rsgedit gui you need to install \texttt{wxWidgets} with OpenGL support. The following commands download and installed the required packages:
+
+\texttt{\$ sudo apt-get install libwxgtk2.8-dev}
+\texttt{\$ sudo ldconfig}
+
+Build rsgedit with steps describe in step 4.
+
+\item Simspark utilities
+
+Simspark utilities require Boost and Simspark library. Build with steps describe in step 4.
+
+\end{itemize}
\end{enumerate}
\section{An Example of a Simulation Run}
@@ -265,7 +284,7 @@
\item{Connect an agent}
The next step is to connect one or more agents to the simulation. To
-do this please change to a separate console window and type \texttt{agentspark}.
+do this please change to a separate console window and type \texttt{rcssagent3d}.
This starts the example agent that is included with SimSpark.
You should now see a humanoid robot appear on the field, as in figure
Modified: trunk/rcssserver3d/doc/users/introduction.tex
===================================================================
--- trunk/rcssserver3d/doc/users/introduction.tex 2009-02-06 02:05:26 UTC (rev 41)
+++ trunk/rcssserver3d/doc/users/introduction.tex 2009-02-08 00:25:53 UTC (rev 42)
@@ -105,8 +105,8 @@
available monitor and log player setups. Their configuration and usage
is described in detail there.
-The following chapter \ref{cha:agentspark} explains the
-\texttt{agentspark} demo agent. This agent is a reference implementation and
+The following chapter \ref{cha:rcssagent3d} explains the
+\texttt{rcssagent3d} demo agent. This agent is a reference implementation and
a basis to start your own agent implementation work. We explain how
to configure the agent to use custom behavior implementations.
Modified: trunk/rcssserver3d/doc/users/overview.tex
===================================================================
--- trunk/rcssserver3d/doc/users/overview.tex 2009-02-06 02:05:26 UTC (rev 41)
+++ trunk/rcssserver3d/doc/users/overview.tex 2009-02-08 00:25:53 UTC (rev 42)
@@ -117,7 +117,7 @@
soccer game. In recent versions players possess articulated bodies
that resemble humanoid robots.
-\section{Available Robot Models}
+%\section{Available Robot Models}
%NEC Papero Roboter Joschka
%Fabio Della Libera models the VStone VisiON 4g
Added: trunk/rcssserver3d/doc/users/rcssagent3d.tex
===================================================================
--- trunk/rcssserver3d/doc/users/rcssagent3d.tex (rev 0)
+++ trunk/rcssserver3d/doc/users/rcssagent3d.tex 2009-02-08 00:25:53 UTC (rev 42)
@@ -0,0 +1,47 @@
+\chapter{Rcssagent3d}
+\label{cha:rcssagent3d}
+
+This chapter introduces Rcssagent3D, the demo agent implementation
+available for SimSpark.
+
+\section{Behaviors}
+
+Rcssagent3D is a demo agent implementation for use with the SimSpark
+server. It serves as a testbed for agent implementation. It implements
+all low level details of connecting and communicating with the
+server. It further implements an abstract run loop. The behavior of
+this agent skeleton is implemented using plugins. On of these plugins
+is configured and installed at run time.
+
+\subsection{SoccerbotBehavior}
+
+The \texttt{SoccerbotBehavior} is a minimal example of an agent that
+acts on a soccer field and controls our current humanoid soccer bot
+model. It demonstrates reading preceptor values and controlling the
+robot with the installed effectors in a control loop. The implemented
+behavior resembles the classic \texttt{hello world} program in a
+way. It moves up the arms of the robot and repeatedly waves hello.
+
+\section{How to change Behaviors?}
+
+The different Behaviors of Rcssagent3D are encapsulated in classes
+that derive from the \texttt{Behavior} class. Classes of this type
+implement an interface with two functions that each return a command
+string that is then send to the SimSpark server.
+
+The first implemented function is \texttt{Init}. This function is
+called once when the agent initially connected to the server. It is
+typically used to construct the agent representation in the server
+with the help of the \texttt{scene} effector and to move the agent to
+a suitable start position in the simulation.
+
+The second implemented function is called \texttt{Think}. This
+function is called every simulation cycle. As a parameter it receives
+the sensor data as reported from the server in the last cycle. This
+function should implements the main behavior run loop of each
+agent.
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "user-manual"
+%%% End:
Modified: trunk/rcssserver3d/doc/users/resources.tex
===================================================================
--- trunk/rcssserver3d/doc/users/resources.tex 2009-02-06 02:05:26 UTC (rev 41)
+++ trunk/rcssserver3d/doc/users/resources.tex 2009-02-08 00:25:53 UTC (rev 42)
@@ -10,7 +10,7 @@
\section{Mailing Lists}
-si...@li...
+si...@li...\\
sse...@li...
\section{IRC channel}
Modified: trunk/rcssserver3d/doc/users/robots.tex
===================================================================
--- trunk/rcssserver3d/doc/users/robots.tex 2009-02-06 02:05:26 UTC (rev 41)
+++ trunk/rcssserver3d/doc/users/robots.tex 2009-02-08 00:25:53 UTC (rev 42)
@@ -3,7 +3,7 @@
%Later: HOAP-2, NEC Papero (I already did a model in Blender), CITIZEN Eco-Be!, VisiON 4g (Fabio Dalla Libera is working on that), AIBO via RoSIML importer
-Below, we only describe the most advanced robot model that comes with the simulation package at this point in time: the Soccerbot. There are some other models which you can find in the directory \texttt{app/simspark/rsg/agent/}, e.g., the soccerplayer.rsg, or the hoap2.rsg files. These are currently not in use in any simulation, and considered experimental.
+Below, we only describe the most advanced robot model that comes with the simulation package at this point in time: the Soccerbot. There are some other models which you can find in the directory \texttt{rcssserver3d/data/rsg/agent/}, e.g., the soccerplayer.rsg, or the hoap2.rsg files. These are currently not in use in any simulation, and considered experimental.
Besides that, work is in progress on other robot models and will be described here when usable. We plan to integrate an improved model of the HOAP-2 robot from Fujitsu Automation, and models of the VisiON 4g robot, and the Sony AIBO. For help on how to model new robots for your simulation, please have a look at tutorials in the SimSpark Wiki at \\
@@ -13,18 +13,18 @@
This is the robot currently used in the competitions of the 3D Soccer Simulation League at RoboCup. It is a humanoid robot with 20 degrees of freedom (DOF) as depicted in figure \ref{fig:soccerbotdof}. Its current dimensions are quite unrealistic for a real humanoid robot (see table \ref{table:dimensions} which is due to instabilities in the physics simulation at the time the robot was first modeled. This is a serious shortcoming of this robot model and should be changed. Another open issue is that the joint ranges are not limited in the current model. This allows for very unrealistic movements which can be fun to watch, but can lead to unfair behavior in a competition.
-\begin{figure}[htp]
-\begin{minipage}[b]{0.5\linewidth}
-\centering
-\includegraphics[width=6cm]{fig/soccerbotfront}
-\caption{Frontal view of the Soccerbot in the simulation}
-\end{minipage}
-\hspace{0.5cm}
-\begin{minipage}[b]{0.5\linewidth}
-\centering
-\includegraphics[width=6cm]{fig/soccerbotside}
-\caption{Side view of the Soccerbot in the simulation}
-\end{minipage}
+\begin{figure}[htp]
+\begin{minipage}[b]{0.5\linewidth}
+\centering
+\includegraphics[width=6cm]{fig/soccerbotfront}
+\caption{Frontal view of the Soccerbot in the simulation}
+\end{minipage}
+\hspace{0.5cm}
+\begin{minipage}[b]{0.5\linewidth}
+\centering
+\includegraphics[width=6cm]{fig/soccerbotside}
+\caption{Side view of the Soccerbot in the simulation}
+\end{minipage}
\end{figure}
\begin{figure}[htp]
@@ -217,7 +217,7 @@
\subsection{Implementation}
The Nao robot model is implemented in the rsg files under
-\texttt{app/simspark/rsg/agent/nao}, see \autoref{tab:nao-implement}
+\texttt{rcssserver3d/data/rsg/agent/nao}, see \autoref{tab:nao-implement}
for details. This section goes much deeper and is a little boring.
\begin{table}[htp]
\centering
Modified: trunk/rcssserver3d/doc/users/simspark.tex
===================================================================
--- trunk/rcssserver3d/doc/users/simspark.tex 2009-02-06 02:05:26 UTC (rev 41)
+++ trunk/rcssserver3d/doc/users/simspark.tex 2009-02-08 00:25:53 UTC (rev 42)
@@ -331,7 +331,7 @@
effectors and preceptors.
\begin{itemize}
\item[Message format:] \texttt{(scene <filename>)}
- \item[Example message:] \texttt{(scene rsg/agent/soccerbot056.rsg)}
+ \item[Example message:] \texttt{(scene rsg/agent/nao/nao.rsg)}
\end{itemize}
After the agent representation is constructed in the server the agent
@@ -630,14 +630,14 @@
\end{figure}
%----------------------------------------------------------------------
-\section{Setup Scripts}
+%\section{Setup Scripts}
-\textbf{TODO:}
+%\textbf{TODO:}
-\begin{itemize}
-\item describe purpose of scripts in \~/.rcssserver3d/
-\item kerosin.rb for rendering configuration of simspark
-\end{itemize}
+%\begin{itemize}
+%\item describe purpose of scripts in \~/.rcssserver3d/
+%\item kerosin.rb for rendering configuration of simspark
+%\end{itemize}
%%% Local Variables:
%%% mode: latex
Modified: trunk/rcssserver3d/doc/users/simulations.tex
===================================================================
--- trunk/rcssserver3d/doc/users/simulations.tex 2009-02-06 02:05:26 UTC (rev 41)
+++ trunk/rcssserver3d/doc/users/simulations.tex 2009-02-08 00:25:53 UTC (rev 42)
@@ -95,7 +95,7 @@
game. He is further able to command a \texttt{free kick} where one
player is able to shoot from a short distance to the goal.
-\subsection{Setup Script}
+%\subsection{Setup Script}
%%% Local Variables:
Modified: trunk/rcssserver3d/doc/users/user-manual.tex
===================================================================
--- trunk/rcssserver3d/doc/users/user-manual.tex 2009-02-06 02:05:26 UTC (rev 41)
+++ trunk/rcssserver3d/doc/users/user-manual.tex 2009-02-08 00:25:53 UTC (rev 42)
@@ -1,10 +1,10 @@
\include{definitions}
\author{Joschka Boedecker \\ Klaus Dorer \\ Markus Rollmann \\ Yuan Xu
-\\ Feng Xue}
+\\ Feng Xue \\ Marian Buchta}
\title{Simspark User Manual}
-\date{June 2008}
+\date{February 2009}
\begin{document}
@@ -26,7 +26,7 @@
\input{gettingstarted}
\input{simspark}
\input{monitorspark}
-\input{agentspark}
+\input{rcssagent3d}
\input{simulations}
\input{robots}
\input{resources}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
