Updated to Newton2 and angelscript 2.22.0

.gitignore

@@ -5,3 +5,9 @@
 /*.xcodeproj/*.pbxuser
 /assets/*.log
 /assets/core/cache/*collcach
+.cproject
+.project
+CMakeCache.txt
+CMakeFiles
+cmake_install.cmake
+

CMakeLists.txt

@@ -28,7 +28,68 @@ add_library(Newton STATIC IMPORTED)
 set_target_properties(Newton PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/lib/linux/libNewton.a)
 
 add_library(angelscript STATIC IMPORTED)
-set_target_properties(angelscript PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/lib/linux/libangelscript.a)
+set_target_properties(angelscript PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/lib/linux/libAngelscript.a)
 
-add_library(SDLmain STATIC IMPORTED)
-set_target_properties(SDLmain PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/lib/linux/libSDLmain.a)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
+
+INCLUDE(FindSDL)
+INCLUDE(FindSDL_ttf)
+INCLUDE(FindSDL_image)
+INCLUDE(FindOpenAL)
+INCLUDE(FindOpenGL)
+INCLUDE(FindALUT)
+INCLUDE(FindOGG)
+INCLUDE(FindVorbis)
+INCLUDE(FindTinyXML)
+INCLUDE(FindGLee)
+
+find_package(SDL REQUIRED)
+find_package(SDL_ttf REQUIRED)
+find_package(SDL_image REQUIRED)
+find_package(OpenAL REQUIRED)
+find_package(OpenGL REQUIRED)
+find_package(ALUT REQUIRED)
+find_package(OGG REQUIRED)
+find_package(Vorbis REQUIRED)
+find_package(TinyXML REQUIRED)
+find_package(GLee REQUIRED)
+
+if (NOT SDL_FOUND)
+	message(FATAL_ERROR "Package SDL could not be found")
+endif (NOT SDL_FOUND)
+
+if (NOT SDLTTF_FOUND)
+	message(FATAL_ERROR "Package SDL_ttf could not be found")
+endif (NOT SDLTTF_FOUND)
+
+if (NOT SDLIMAGE_FOUND)
+	message(FATAL_ERROR "Package SDL_image could not be found")
+endif (NOT SDLIMAGE_FOUND)
+
+if (NOT OPENAL_FOUND)
+	message (FATAL_ERROR "Package OpenAL could not be found")
+endif (NOT OPENAL_FOUND)
+
+if (NOT OPENGL_FOUND)
+	message (FATAL_ERROR "Package OpenGL could not be found")
+endif (NOT OPENGL_FOUND)
+
+if (NOT ALUT_FOUND)
+	message (FATAL_ERROR "Package OpenAL Utility Toolkit (ALUT) could not be found")
+endif (NOT ALUT_FOUND)
+
+if (NOT OGG_FOUND)
+	message (FATAL_ERROR "Package OGG could not be found")
+endif (NOT OGG_FOUND)
+
+if (NOT VORBIS_FOUND)
+	message (FATAL_ERROR "Package Vorbis could not be found")
+endif (NOT VORBIS_FOUND)
+
+if (NOT TINYXML_FOUND)
+	message (FATAL_ERROR "Package TinyXML could not be found")
+endif (NOT TINYXML_FOUND)
+
+if (NOT GLEE_FOUND)
+	message (FATAL_ERROR "Package libGLee could not be found")
+endif (NOT GLEE_FOUND)

CMakeModules/FindALUT.cmake

@@ -0,0 +1,78 @@
+# Locate ALUT
+# This module defines XXX_FOUND, XXX_INCLUDE_DIRS and XXX_LIBRARIES standard variables
+#
+# $ALUTDIR is an environment variable that would
+# correspond to the ./configure --prefix=$ALUTDIR
+# used in building ALUT.
+#
+# Created by Sukender (Benoit Neil). Based on FindOpenAL.cmake module.
+
+IF(ALUT_USE_AL_SUBDIR)
+	SET(ALUT_HEADER_NAMES "AL/alut.h")
+	SET(ALUT_HEADER_SUFFIXES include)
+ELSE()
+	SET(ALUT_HEADER_NAMES "alut.h")
+	SET(ALUT_HEADER_SUFFIXES include/AL include/OpenAL include)
+ENDIF()
+
+SET(ALUT_SEARCH_PATHS
+	~/Library/Frameworks
+	/Library/Frameworks
+	/usr/local
+	/usr
+	/sw # Fink
+	/opt/local # DarwinPorts
+	/opt/csw # Blastwave
+	/opt
+)
+
+FIND_PATH(ALUT_INCLUDE_DIR NAMES ${ALUT_HEADER_NAMES}
+	HINTS
+	$ENV{ALUTDIR}
+	$ENV{ALUT_PATH}
+	PATH_SUFFIXES ${ALUT_HEADER_SUFFIXES}
+	PATHS ${ALUT_SEARCH_PATHS}
+)
+
+FIND_LIBRARY(ALUT_LIBRARY 
+	NAMES alut libalut
+	HINTS
+	$ENV{ALUTDIR}
+	$ENV{ALUT_PATH}
+	PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 Release
+	PATHS ${ALUT_SEARCH_PATHS}
+)
+
+# First search for d-suffixed libs
+FIND_LIBRARY(ALUT_LIBRARY_DEBUG 
+	NAMES alutd libalutd
+	HINTS
+	$ENV{ALUTDIR}
+	$ENV{ALUT_PATH}
+	PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 Debug
+	PATHS ${ALUT_SEARCH_PATHS}
+)
+
+IF(NOT ALUT_LIBRARY_DEBUG)
+	# Then search for non suffixed libs if necessary, but only in debug dirs
+	FIND_LIBRARY(ALUT_LIBRARY_DEBUG 
+		NAMES alut libalut
+		HINTS
+		$ENV{ALUTDIR}
+		$ENV{ALUT_PATH}
+		PATH_SUFFIXES Debug
+		PATHS ${ALUT_SEARCH_PATHS}
+	)
+ENDIF()
+
+IF(ALUT_LIBRARY)
+	IF(ALUT_LIBRARY_DEBUG)
+		SET(ALUT_LIBRARIES optimized "${ALUT_LIBRARY}" debug "${ALUT_LIBRARY_DEBUG}")
+	ELSE()
+		SET(ALUT_LIBRARIES "${ALUT_LIBRARY}")		# Could add "general" keyword, but it is optional
+	ENDIF()
+ENDIF()
+
+# handle the QUIETLY and REQUIRED arguments and set XXX_FOUND to TRUE if all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALUT DEFAULT_MSG ALUT_LIBRARIES ALUT_INCLUDE_DIR)

CMakeModules/FindGLee.cmake

@@ -0,0 +1,10 @@
+# Try to find libGLee
+# Based upon FindBZip2 which is included in cmake 2.6
+
+
+FIND_PATH(GLEE_INCLUDE_DIR GLee.h PATH "GL")
+FIND_LIBRARY(GLEE_LIBRARY NAMES glee PATH_SUFFIXES "lib" PATH "GL")
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Glee DEFAULT_MSG GLEE_LIBRARY GLEE_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(GLEE_INCLUDE_DIR GLEE_LIBRARY)

CMakeModules/FindOGG.cmake

@@ -0,0 +1,83 @@
+# Locate OGG
+# This module defines XXX_FOUND, XXX_INCLUDE_DIRS and XXX_LIBRARIES standard variables
+#
+# $OGGDIR is an environment variable that would
+# correspond to the ./configure --prefix=$OGGDIR
+# used in building OGG.
+
+SET(OGG_SEARCH_PATHS
+	~/Library/Frameworks
+	/Library/Frameworks
+	/usr/local
+	/usr
+	/sw # Fink
+	/opt/local # DarwinPorts
+	/opt/csw # Blastwave
+	/opt
+)
+
+SET(MSVC_YEAR_NAME)
+IF (MSVC_VERSION GREATER 1599)		# >= 1600
+	SET(MSVC_YEAR_NAME VS2010)
+ELSEIF(MSVC_VERSION GREATER 1499)	# >= 1500
+	SET(MSVC_YEAR_NAME VS2008)
+ELSEIF(MSVC_VERSION GREATER 1399)	# >= 1400
+	SET(MSVC_YEAR_NAME VS2005)
+ELSEIF(MSVC_VERSION GREATER 1299)	# >= 1300
+	SET(MSVC_YEAR_NAME VS2003)
+ELSEIF(MSVC_VERSION GREATER 1199)	# >= 1200
+	SET(MSVC_YEAR_NAME VS6)
+ENDIF()
+
+FIND_PATH(OGG_INCLUDE_DIR
+	NAMES ogg/ogg.h ogg/os_types.h
+	HINTS
+	$ENV{OGGDIR}
+	$ENV{OGG_PATH}
+	PATH_SUFFIXES include
+	PATHS ${OGG_SEARCH_PATHS}
+)
+
+FIND_LIBRARY(OGG_LIBRARY 
+	NAMES ogg libogg
+	HINTS
+	$ENV{OGGDIR}
+	$ENV{OGG_PATH}
+	PATH_SUFFIXES lib lib64 win32/Dynamic_Release "Win32/${MSVC_YEAR_NAME}/x64/Release" "Win32/${MSVC_YEAR_NAME}/Win32/Release"
+	PATHS ${OGG_SEARCH_PATHS}
+)
+
+# First search for d-suffixed libs
+FIND_LIBRARY(OGG_LIBRARY_DEBUG 
+	NAMES oggd ogg_d liboggd libogg_d
+	HINTS
+	$ENV{OGGDIR}
+	$ENV{OGG_PATH}
+	PATH_SUFFIXES lib lib64 win32/Dynamic_Debug "Win32/${MSVC_YEAR_NAME}/x64/Debug" "Win32/${MSVC_YEAR_NAME}/Win32/Debug"
+	PATHS ${OGG_SEARCH_PATHS}
+)
+
+IF(NOT OGG_LIBRARY_DEBUG)
+	# Then search for non suffixed libs if necessary, but only in debug dirs
+	FIND_LIBRARY(OGG_LIBRARY_DEBUG 
+		NAMES ogg libogg
+		HINTS
+		$ENV{OGGDIR}
+		$ENV{OGG_PATH}
+		PATH_SUFFIXES win32/Dynamic_Debug "Win32/${MSVC_YEAR_NAME}/x64/Debug" "Win32/${MSVC_YEAR_NAME}/Win32/Debug"
+		PATHS ${OGG_SEARCH_PATHS}
+	)
+ENDIF()
+
+
+IF(OGG_LIBRARY)
+	IF(OGG_LIBRARY_DEBUG)
+		SET(OGG_LIBRARIES optimized "${OGG_LIBRARY}" debug "${OGG_LIBRARY_DEBUG}")
+	ELSE()
+		SET(OGG_LIBRARIES "${OGG_LIBRARY}")		# Could add "general" keyword, but it is optional
+	ENDIF()
+ENDIF()
+
+# handle the QUIETLY and REQUIRED arguments and set XXX_FOUND to TRUE if all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OGG DEFAULT_MSG OGG_LIBRARIES OGG_INCLUDE_DIR)

CMakeModules/FindTinyXML.cmake

@@ -0,0 +1,10 @@
+# Try to find tinyxml
+# Based upon FindBZip2 which is included in cmake 2.6
+
+
+FIND_PATH(TINYXML_INCLUDE_DIR tinyxml.h)
+FIND_LIBRARY(TINYXML_LIBRARY NAMES tinyxml)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TinyXML DEFAULT_MSG TINYXML_LIBRARY TINYXML_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(TINYXML_INCLUDE_DIR TINYXML_LIBRARY)

CMakeModules/FindVorbis.cmake

@@ -0,0 +1,83 @@
+# Locate Vorbis
+# This module defines XXX_FOUND, XXX_INCLUDE_DIRS and XXX_LIBRARIES standard variables
+#
+# $VORBISDIR is an environment variable that would
+# correspond to the ./configure --prefix=$VORBISDIR
+# used in building Vorbis.
+
+SET(VORBIS_SEARCH_PATHS
+	~/Library/Frameworks
+	/Library/Frameworks
+	/usr/local
+	/usr
+	/sw # Fink
+	/opt/local # DarwinPorts
+	/opt/csw # Blastwave
+	/opt
+)
+
+SET(MSVC_YEAR_NAME)
+IF (MSVC_VERSION GREATER 1599)		# >= 1600
+	SET(MSVC_YEAR_NAME VS2010)
+ELSEIF(MSVC_VERSION GREATER 1499)	# >= 1500
+	SET(MSVC_YEAR_NAME VS2008)
+ELSEIF(MSVC_VERSION GREATER 1399)	# >= 1400
+	SET(MSVC_YEAR_NAME VS2005)
+ELSEIF(MSVC_VERSION GREATER 1299)	# >= 1300
+	SET(MSVC_YEAR_NAME VS2003)
+ELSEIF(MSVC_VERSION GREATER 1199)	# >= 1200
+	SET(MSVC_YEAR_NAME VS6)
+ENDIF()
+
+FIND_PATH(VORBIS_INCLUDE_DIR
+	NAMES vorbis/codec.h
+	HINTS
+	$ENV{VORBISDIR}
+	$ENV{VORBIS_PATH}
+	PATH_SUFFIXES include
+	PATHS ${VORBIS_SEARCH_PATHS}
+)
+
+FIND_LIBRARY(VORBIS_LIBRARY 
+	NAMES vorbis libvorbis
+	HINTS
+	$ENV{VORBISDIR}
+	$ENV{VORBIS_PATH}
+	PATH_SUFFIXES lib lib64 win32/Vorbis_Dynamic_Release "Win32/${MSVC_YEAR_NAME}/x64/Release" "Win32/${MSVC_YEAR_NAME}/Win32/Release"
+	PATHS ${VORBIS_SEARCH_PATHS}
+)
+
+# First search for d-suffixed libs
+FIND_LIBRARY(VORBIS_LIBRARY_DEBUG 
+	NAMES vorbisd vorbis_d libvorbisd libvorbis_d
+	HINTS
+	$ENV{VORBISDIR}
+	$ENV{VORBIS_PATH}
+	PATH_SUFFIXES lib lib64 win32/Vorbis_Dynamic_Debug "Win32/${MSVC_YEAR_NAME}/x64/Debug" "Win32/${MSVC_YEAR_NAME}/Win32/Debug"
+	PATHS ${VORBIS_SEARCH_PATHS}
+)
+
+IF(NOT VORBIS_LIBRARY_DEBUG)
+	# Then search for non suffixed libs if necessary, but only in debug dirs
+	FIND_LIBRARY(VORBIS_LIBRARY_DEBUG 
+		NAMES vorbis libvorbis
+		HINTS
+		$ENV{VORBISDIR}
+		$ENV{VORBIS_PATH}
+		PATH_SUFFIXES win32/Vorbis_Dynamic_Debug "Win32/${MSVC_YEAR_NAME}/x64/Debug" "Win32/${MSVC_YEAR_NAME}/Win32/Debug"
+		PATHS ${VORBIS_SEARCH_PATHS}
+	)
+ENDIF()
+
+
+IF(VORBIS_LIBRARY)
+	IF(VORBIS_LIBRARY_DEBUG)
+		SET(VORBIS_LIBRARIES optimized "${VORBIS_LIBRARY}" debug "${VORBIS_LIBRARY_DEBUG}")
+	ELSE()
+		SET(VORBIS_LIBRARIES "${VORBIS_LIBRARY}")		# Could add "general" keyword, but it is optional
+	ENDIF()
+ENDIF()
+
+# handle the QUIETLY and REQUIRED arguments and set XXX_FOUND to TRUE if all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(VORBIS DEFAULT_MSG VORBIS_LIBRARIES VORBIS_INCLUDE_DIR)

CMakeModules/README

@@ -0,0 +1,5 @@
+The following CMake find modules are taken from osgaudio (http://code.google.com/p/osgaudio/) and are under LGPL 2.1
+- FindALUT.cmake
+- FindOGG.cmake
+- FindVorbis.cmake
+