[Gemrb-commits] gemrb: branch master updated. v0.6.2-1118-g2ffea7a

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  2ffea7a5e8b2389f73437ab4f76a2a9219a95d29 (commit)
       via  e377bb26551f2448c571f34e69014c503bf3d68f (commit)
       via  69868e92a355a6ed1e63ca921bb5dafe46ecb279 (commit)

Summary of changes:
 CMakeLists.txt |   21 ++++++++++++++-------
 NEWS           |    6 ++++--
 2 files changed, 18 insertions(+), 9 deletions(-)
      from  28e81ee93ae479b7c773360086b94aa07f209dd9 (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=2ffea7a5e8b2389f73437ab4f76a2a9219a95d29

commit 2ffea7a5e8b2389f73437ab4f76a2a9219a95d29
Author: Jaka Kranjc <lyn...@us...>
Date:   Mon Apr 25 12:49:39 2011 +0200

    cmake: also display the value of INSOURCEBUILD

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c5a870..1e6079c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -351,6 +351,7 @@ message(STATUS "  LAYOUT: ${LAYOUT}")
 PRINT_OPTION("${NOCOLOR}" "NOCOLOR")
 PRINT_OPTION("${TOUCHSCREEN}" "TOUCHSCREEN")
 PRINT_OPTION("${STATIC_LINK}" "STATIC_LINK")
+PRINT_OPTION("${INSOURCEBUILD}" "INSOURCEBUILD")
 message(STATUS "")
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 message(STATUS "")

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=e377bb26551f2448c571f34e69014c503bf3d68f

commit e377bb26551f2448c571f34e69014c503bf3d68f
Author: Jaka Kranjc <lyn...@us...>
Date:   Mon Apr 25 12:47:50 2011 +0200

    cmake: added a pretty-option-printing macro

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10d98e1..3c5a870 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -322,6 +322,16 @@ add_custom_target( dist
 	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 )
 
+# pretty-print options macro
+# as of 2.8 cmake does not support anything like EVAL
+MACRO(PRINT_OPTION option name)
+if (${option})
+	message(STATUS "  ${name}: ${option}")
+else()
+	message(STATUS "  ${name}: disabled")
+endif()
+ENDMACRO(PRINT_OPTION)
+
 message(STATUS "")
 message(STATUS "These are the configured paths:")
 message(STATUS "  PREFIX: ${CMAKE_INSTALL_PREFIX}")
@@ -338,13 +348,9 @@ message(STATUS "  MENU_DIR: ${MENU_DIR}")
 message(STATUS "")
 message(STATUS "Options:")
 message(STATUS "  LAYOUT: ${LAYOUT}")
-message(STATUS "  NOCOLOR: ${NOCOLOR}")
-message(STATUS "  TOUCHSCREEN: ${TOUCHSCREEN}")
-if (STATIC_LINK)
-	message(STATUS "  STATIC_LINK: ${STATIC_LINK}")
-else()
-	message(STATUS "  STATIC_LINK: disabled")
-endif()
+PRINT_OPTION("${NOCOLOR}" "NOCOLOR")
+PRINT_OPTION("${TOUCHSCREEN}" "TOUCHSCREEN")
+PRINT_OPTION("${STATIC_LINK}" "STATIC_LINK")
 message(STATUS "")
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 message(STATUS "")

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=69868e92a355a6ed1e63ca921bb5dafe46ecb279

commit 69868e92a355a6ed1e63ca921bb5dafe46ecb279
Author: Jaka Kranjc <lyn...@us...>
Date:   Mon Apr 25 12:26:52 2011 +0200

    ups, completely forgot about the regular news update

diff --git a/NEWS b/NEWS
index dfaddfb..c829b80 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,12 @@
-GemRB git (b10cdc3):
+GemRB git (28e81ee93ae479):
   New features:
     - 
+    - yet more unhardcoded PST projectiles
 
   Improved features:
     - 
-    - bugfixes
+    - effects, triggers, actions, dialogs
+    - bugfixes and internal cleanups
 
   Applied patches:
 

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator