Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[50] trunk/spark
|
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.
|