Menu
▾
▴
[Gemrb-commits] gemrb: branch master updated. 9386fd908367f981a04cbf8271036cc3ef59e438
|
From: Jaka K. <lyn...@us...> - 2010-08-16 19:24:05
|
gemrb: Infinity Engine emulator
The branch master has been updated
via 9386fd908367f981a04cbf8271036cc3ef59e438 (commit)
via b266cc84c29e42129961d5710dc498bf0ecfc722 (commit)
via c97f31eaaa5ab618d72b9e7cec0c0523ee6e7075 (commit)
Summary of changes:
CMakeLists.txt | 116 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 66 insertions(+), 50 deletions(-)
from 3f790915fb698f4eacd0fea12dc96431e2c76936 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=9386fd908367f981a04cbf8271036cc3ef59e438
commit 9386fd908367f981a04cbf8271036cc3ef59e438
Author: Jaka Kranjc <lyn...@us...>
Date: Mon Aug 16 21:31:25 2010 +0200
cmake: ordered the dependencies, so the required ones are checked first
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae82aee..4b247ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,6 +110,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
endif (NOT APPLE AND NOT UNSAFE_PLUGIN)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+# Check for all the required and optional dependencies
INCLUDE(FindPythonLibs)
IF(PYTHON_LIBRARY)
MESSAGE(STATUS "Looking for Python libraries: found")
@@ -118,6 +119,31 @@ ELSE()
MESSAGE(FATAL_ERROR "Please get the development libraries from www.python.org")
ENDIF()
+INCLUDE(FindSDL)
+IF(SDL_FOUND)
+ MESSAGE(STATUS "Looking for SDL: found")
+ELSE()
+ MESSAGE(SEND_ERROR "Looking for SDL: not found!")
+ MESSAGE(FATAL_ERROR "Please get it from www.libsdl.org")
+ENDIF()
+
+INCLUDE(FindZLIB)
+IF(ZLIB_FOUND)
+ MESSAGE(STATUS "Looking for Zlib: found")
+ELSE()
+ MESSAGE(SEND_ERROR "Looking for Zlib: not found!")
+ MESSAGE(FATAL_ERROR "Please install the Zlib library and headers first!")
+ENDIF()
+
+IF(UNIX)
+ FIND_LIBRARY(DLD_LIBRARY_PATH dl dld)
+ IF(DLD_LIBRARY_PATH)
+ MESSAGE(STATUS "Looking for dl library: found")
+ ELSE(DLD_LIBRARY_PATH)
+ MESSAGE(FATAL_ERROR "Looking for dl library: not found!")
+ ENDIF(DLD_LIBRARY_PATH)
+ENDIF(UNIX)
+
INCLUDE(FindOpenAL)
IF(OPENAL_FOUND)
MESSAGE(STATUS "Looking for OpenAL: found")
@@ -127,14 +153,6 @@ ELSE()
MESSAGE(WARNING "If it just wasn't found, try setting the OPENALDIR environment variable.")
ENDIF()
-INCLUDE(FindSDL)
-IF(SDL_FOUND)
- MESSAGE(STATUS "Looking for SDL: found")
-ELSE()
- MESSAGE(SEND_ERROR "Looking for SDL: not found!")
- MESSAGE(FATAL_ERROR "Please get it from www.libsdl.org")
-ENDIF()
-
INCLUDE(FindSDL_mixer)
IF(SDLMIXER_FOUND)
MESSAGE(STATUS "Looking for SDL_mixer: found")
@@ -143,14 +161,6 @@ ELSE()
MESSAGE(WARNING "If you want to build the SDL_mixer plugin, install SDL_mixer first.")
ENDIF()
-INCLUDE(FindZLIB)
-IF(ZLIB_FOUND)
- MESSAGE(STATUS "Looking for Zlib: found")
-ELSE()
- MESSAGE(SEND_ERROR "Looking for Zlib: not found!")
- MESSAGE(FATAL_ERROR "Please install the Zlib library and headers first!")
-ENDIF()
-
INCLUDE(FindPNG)
IF(PNG_FOUND)
MESSAGE(STATUS "Looking for libPNG: found")
@@ -160,15 +170,6 @@ ELSE()
MESSAGE(WARNING "While no original game data is in PNG format, some mod data is and will need conversion.")
ENDIF()
-IF(UNIX)
- FIND_LIBRARY(DLD_LIBRARY_PATH dl dld)
- IF(DLD_LIBRARY_PATH)
- MESSAGE(STATUS "Looking for dl library: found")
- ELSE(DLD_LIBRARY_PATH)
- MESSAGE(FATAL_ERROR "Looking for dl library: not found!")
- ENDIF(DLD_LIBRARY_PATH)
-ENDIF(UNIX)
-
FIND_LIBRARY(VORBIS_LIBRARY vorbisfile)
IF(VORBIS_LIBRARY)
MESSAGE(STATUS "Looking for Ogg Vorbis support: found")
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=b266cc84c29e42129961d5710dc498bf0ecfc722
commit b266cc84c29e42129961d5710dc498bf0ecfc722
Author: Jaka Kranjc <lyn...@us...>
Date: Mon Aug 16 21:26:05 2010 +0200
cmake: made the dependency checks more concise and consistent on success
added missing output for above
made zlib required
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9a6bee..ae82aee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,57 +110,72 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
endif (NOT APPLE AND NOT UNSAFE_PLUGIN)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-MESSAGE(STATUS "Looking for Python libraries")
INCLUDE(FindPythonLibs)
IF(PYTHON_LIBRARY)
- MESSAGE(STATUS "Python Libraries Found")
-ELSE(PYTHON_LIBRARY)
- MESSAGE(FATAL_ERROR "Unable to find Python development libraries. Please get it from www.python.org")
-ENDIF(PYTHON_LIBRARY)
+ MESSAGE(STATUS "Looking for Python libraries: found")
+ELSE()
+ MESSAGE(SEND_ERROR "Looking for Python libraries: not found!")
+ MESSAGE(FATAL_ERROR "Please get the development libraries from www.python.org")
+ENDIF()
-MESSAGE(STATUS "Looking for openAL libraries")
INCLUDE(FindOpenAL)
IF(OPENAL_FOUND)
- MESSAGE(STATUS "openal found")
-ELSE(OPENAL_FOUND)
- MESSAGE(ERROR "unable to find openal. Please set OPENALDIR environment variable or get it from www.openal.org")
-ENDIF(OPENAL_FOUND)
+ MESSAGE(STATUS "Looking for OpenAL: found")
+ELSE()
+ MESSAGE(WARNING "Looking for OpenAL: not found!")
+ MESSAGE(WARNING "If you want to build the OpenAL plugin, get OpenAL from www.openal.org.")
+ MESSAGE(WARNING "If it just wasn't found, try setting the OPENALDIR environment variable.")
+ENDIF()
-MESSAGE(STATUS "Looking for SDL")
INCLUDE(FindSDL)
IF(SDL_FOUND)
- MESSAGE(STATUS "SDL found")
-ELSE(SDL_FOUND)
- MESSAGE(FATAL_ERROR "unable to find SDL. Please get it from www.libsdl.org")
-ENDIF(SDL_FOUND)
+ MESSAGE(STATUS "Looking for SDL: found")
+ELSE()
+ MESSAGE(SEND_ERROR "Looking for SDL: not found!")
+ MESSAGE(FATAL_ERROR "Please get it from www.libsdl.org")
+ENDIF()
-MESSAGE(STATUS "Looking for SDL_mixer")
INCLUDE(FindSDL_mixer)
+IF(SDLMIXER_FOUND)
+ MESSAGE(STATUS "Looking for SDL_mixer: found")
+ELSE()
+ MESSAGE(WARNING "Looking for SDL_mixer: not found!")
+ MESSAGE(WARNING "If you want to build the SDL_mixer plugin, install SDL_mixer first.")
+ENDIF()
-MESSAGE( STATUS "Looking for Zlib" )
-#SET(ZLIB_FIND_REQUIRED TRUE)
INCLUDE(FindZLIB)
+IF(ZLIB_FOUND)
+ MESSAGE(STATUS "Looking for Zlib: found")
+ELSE()
+ MESSAGE(SEND_ERROR "Looking for Zlib: not found!")
+ MESSAGE(FATAL_ERROR "Please install the Zlib library and headers first!")
+ENDIF()
-MESSAGE( STATUS "Looking for libPNG" )
INCLUDE(FindPNG)
IF(PNG_FOUND)
- MESSAGE( STATUS "libPNG found" )
-ELSE(PNG_FOUND)
- MESSAGE( STATUS "WARNING : GemRB will be built without any PNG support. Get it from www.libpng.org" )
-ENDIF(PNG_FOUND)
+ MESSAGE(STATUS "Looking for libPNG: found")
+ELSE()
+ MESSAGE(WARNING "Looking for libPNG: not found!")
+ MESSAGE(WARNING "GemRB will be built without any PNG support. Get it from www.libpng.org" )
+ MESSAGE(WARNING "While no original game data is in PNG format, some mod data is and will need conversion.")
+ENDIF()
IF(UNIX)
- MESSAGE(STATUS "Looking for dl library")
FIND_LIBRARY(DLD_LIBRARY_PATH dl dld)
IF(DLD_LIBRARY_PATH)
- MESSAGE(STATUS "dl library found")
+ MESSAGE(STATUS "Looking for dl library: found")
ELSE(DLD_LIBRARY_PATH)
- MESSAGE(FATAL_ERROR "dl library not found")
+ MESSAGE(FATAL_ERROR "Looking for dl library: not found!")
ENDIF(DLD_LIBRARY_PATH)
ENDIF(UNIX)
-MESSAGE(STATUS "Looking for Ogg Vorbis support")
FIND_LIBRARY(VORBIS_LIBRARY vorbisfile)
+IF(VORBIS_LIBRARY)
+ MESSAGE(STATUS "Looking for Ogg Vorbis support: found")
+ELSE()
+ MESSAGE(WARNING "Looking for Ogg Vorbis support: not found!")
+ MESSAGE(WARNING "While no original game data is in OGG format, some mod data is and will need conversion.")
+ENDIF()
ADD_DEFINITIONS("-DHAVE_CONFIG_H")
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=c97f31eaaa5ab618d72b9e7cec0c0523ee6e7075
commit c97f31eaaa5ab618d72b9e7cec0c0523ee6e7075
Author: Jaka Kranjc <lyn...@us...>
Date: Mon Aug 16 20:31:30 2010 +0200
cmake: a few cosmetic improvements
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83d6a08..d9a6bee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,7 +123,7 @@ INCLUDE(FindOpenAL)
IF(OPENAL_FOUND)
MESSAGE(STATUS "openal found")
ELSE(OPENAL_FOUND)
- MESSAGE(ERROR "unable to find openal. please set OPENALDIR environment variable or get it from www.openal.org")
+ MESSAGE(ERROR "unable to find openal. Please set OPENALDIR environment variable or get it from www.openal.org")
ENDIF(OPENAL_FOUND)
MESSAGE(STATUS "Looking for SDL")
@@ -131,7 +131,7 @@ INCLUDE(FindSDL)
IF(SDL_FOUND)
MESSAGE(STATUS "SDL found")
ELSE(SDL_FOUND)
- MESSAGE(FATAL_ERROR "unable to find SDL. please get it from www.libsdl.org")
+ MESSAGE(FATAL_ERROR "unable to find SDL. Please get it from www.libsdl.org")
ENDIF(SDL_FOUND)
MESSAGE(STATUS "Looking for SDL_mixer")
@@ -192,17 +192,17 @@ CHECK_FUNCTION_EXISTS("strndup" HAVE_STRNDUP)
#Unneeded on windows
IF(NOT WIN32)
-INCLUDE (CheckCXXSourceCompiles)
-CHECK_CXX_SOURCE_COMPILES("typedef void *(* voidvoid)(void);
+ INCLUDE (CheckCXXSourceCompiles)
+ CHECK_CXX_SOURCE_COMPILES("typedef void *(* voidvoid)(void);
-void *object = 0;
-voidvoid function;
-function = (voidvoid) object;
-" PERMITS_OBJECT_TO_FUNCTION_CAST)
+ void *object = 0;
+ voidvoid function;
+ function = (voidvoid) object;
+ " PERMITS_OBJECT_TO_FUNCTION_CAST)
-IF( NOT PERMITS_OBJECT_TO_FUNCTION_CAST )
- SET(HAVE_FORBIDDEN_OBJECT_TO_FUNCTION_CAST 1)
-ENDIF( NOT PERMITS_OBJECT_TO_FUNCTION_CAST )
+ IF( NOT PERMITS_OBJECT_TO_FUNCTION_CAST )
+ SET(HAVE_FORBIDDEN_OBJECT_TO_FUNCTION_CAST 1)
+ ENDIF( NOT PERMITS_OBJECT_TO_FUNCTION_CAST )
ENDIF(NOT WIN32)
IF(VORBIS_LIBRARY)
@@ -238,8 +238,8 @@ ENDMACRO(ADD_GEMRB_PLUGIN)
#gemrb overrides macro
MACRO(ADD_GEMRB_OVERRIDE game_name)
-FILE( GLOB FILES_TO_INSTALL *.2da *.bmp *.ini *.chu *.ids *.bcs *.vvc *.mos *.spl *.wav *.pro)
-INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${DATA_DIR}/override/${game_name} )
+ FILE( GLOB FILES_TO_INSTALL *.2da *.bmp *.ini *.chu *.ids *.bcs *.vvc *.mos *.spl *.wav *.pro)
+ INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${DATA_DIR}/override/${game_name} )
ENDMACRO(ADD_GEMRB_OVERRIDE )
ADD_SUBDIRECTORY( gemrb )
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|