From: Willem J. P. <wjp...@us...> - 2013-02-03 13:13:34
|
gemrb: Infinity Engine emulator The branch master has been updated via 124a9d8dc60c8b37deeea8664fd5bc3593faee42 (commit) Summary of changes: configure.in | 9 +++++++++ gemrb/core/Makefile.am | 6 ++++++ gemrb/override/bg1/Makefile.am | 4 ++-- gemrb/override/bg2/Makefile.am | 4 ++-- gemrb/override/how/Makefile.am | 4 ++-- gemrb/override/iwd/Makefile.am | 4 ++-- gemrb/override/iwd2/Makefile.am | 4 ++-- gemrb/override/pst/Makefile.am | 4 ++-- gemrb/override/shared/Makefile.am | 4 ++-- gemrb/unhardcoded/how/Makefile.am | 4 ++-- gemrb/unhardcoded/iwd/Makefile.am | 4 ++-- gemrb/unhardcoded/iwd2/Makefile.am | 4 ++-- gemrb/unhardcoded/pst/Makefile.am | 4 ++-- gemrb/unhardcoded/shared/Makefile.am | 4 ++-- 14 files changed, 39 insertions(+), 24 deletions(-) from 61ec1a9f1e765c6535082e358f24bc96f8838577 (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=124a9d8dc60c8b37deeea8664fd5bc3593faee42 commit 124a9d8dc60c8b37deeea8664fd5bc3593faee42 Author: Willem Jan Palenstijn <wj...@us...> Date: Sun Feb 3 14:06:49 2013 +0100 Fix autotools build Detection of iconv/freetype is still missing. diff --git a/configure.in b/configure.in index 6e91ac4..19d49be 100644 --- a/configure.in +++ b/configure.in @@ -119,6 +119,7 @@ AC_CHECK_FUNCS([strtol]) AC_CHECK_FUNCS([strtoul]) AC_CHECK_FUNCS([strndup]) AC_CHECK_FUNCS([strnlen]) +AC_CHECK_FUNCS([strlcpy]) AC_CHECK_HEADERS([fcntl.h]) AC_CHECK_HEADERS([stddef.h]) AC_CHECK_HEADERS([sys/time.h]) @@ -237,6 +238,14 @@ gemrb/override/iwd/Makefile gemrb/override/iwd2/Makefile gemrb/override/pst/Makefile gemrb/override/shared/Makefile +gemrb/unhardcoded/Makefile +gemrb/unhardcoded/bg1/Makefile +gemrb/unhardcoded/bg2/Makefile +gemrb/unhardcoded/how/Makefile +gemrb/unhardcoded/iwd/Makefile +gemrb/unhardcoded/iwd2/Makefile +gemrb/unhardcoded/pst/Makefile +gemrb/unhardcoded/shared/Makefile gemrb/GUIScripts/Makefile gemrb/GUIScripts/bg1/Makefile gemrb/GUIScripts/bg2/Makefile diff --git a/gemrb/core/Makefile.am b/gemrb/core/Makefile.am index 663491f..22301eb 100644 --- a/gemrb/core/Makefile.am +++ b/gemrb/core/Makefile.am @@ -88,6 +88,7 @@ libgemrb_core_la_SOURCES = \ SaveGameMgr.cpp \ ScriptEngine.cpp \ Scriptable/Actor.cpp \ + Scriptable/CombatInfo.cpp \ Scriptable/Container.cpp \ Scriptable/Door.cpp \ Scriptable/InfoPoint.cpp \ @@ -104,12 +105,17 @@ libgemrb_core_la_SOURCES = \ StoreMgr.cpp \ StringMgr.cpp \ SymbolMgr.cpp \ + System/Logger/File.cpp \ + System/Logger/MessageWindowLogger.cpp \ + System/Logger/Stdio.cpp \ System/DataStream.cpp \ System/FileStream.cpp \ + System/Logger.cpp \ System/Logging.cpp \ System/MemoryStream.cpp \ System/SlicedStream.cpp \ System/String.cpp \ + System/StringBuffer.cpp \ System/VFS.cpp \ TableMgr.cpp \ Tile.cpp \ diff --git a/gemrb/override/bg1/Makefile.am b/gemrb/override/bg1/Makefile.am index e9c61f4..52ba22e 100644 --- a/gemrb/override/bg1/Makefile.am +++ b/gemrb/override/bg1/Makefile.am @@ -1,3 +1,3 @@ -bg1override_DATA = *.2da *.bmp *.ini *.chu *.ids *.pro +bg1override_DATA = *.2da *.vvc bg1overridedir = $(moddir)/override/bg1/ -EXTRA_DIST = *.2da *.bmp *.ini *.chu *.ids *.pro +EXTRA_DIST = *.2da *.vvc diff --git a/gemrb/override/bg2/Makefile.am b/gemrb/override/bg2/Makefile.am index 7589bd2..32e6c50 100644 --- a/gemrb/override/bg2/Makefile.am +++ b/gemrb/override/bg2/Makefile.am @@ -1,3 +1,3 @@ -bg2override_DATA = *.2da *.ini *.chu *.ids *.vvc *.spl *.pro +bg2override_DATA = *.2da *.vvc bg2overridedir = $(moddir)/override/bg2/ -EXTRA_DIST = *.2da *.ini *.chu *.ids *.vvc *.spl *.pro +EXTRA_DIST = *.2da *.vvc diff --git a/gemrb/override/how/Makefile.am b/gemrb/override/how/Makefile.am index 801744d..cbb7472 100644 --- a/gemrb/override/how/Makefile.am +++ b/gemrb/override/how/Makefile.am @@ -1,3 +1,3 @@ -howoverride_DATA = *.2da *.ini *.chu *.ids *.spl *.pro *.bcs +howoverride_DATA = *.2da *.bcs howoverridedir = $(moddir)/override/how/ -EXTRA_DIST = *.2da *.ini *.chu *.ids *.spl *.pro *.bcs +EXTRA_DIST = *.2da *.bcs diff --git a/gemrb/override/iwd/Makefile.am b/gemrb/override/iwd/Makefile.am index 9db0196..83bdd45 100644 --- a/gemrb/override/iwd/Makefile.am +++ b/gemrb/override/iwd/Makefile.am @@ -1,3 +1,3 @@ -iwdoverride_DATA = *.2da *.bmp *.ini *.chu *.ids *.bcs +iwdoverride_DATA = *.2da *.bcs iwdoverridedir = $(moddir)/override/iwd/ -EXTRA_DIST = *.2da *.bmp *.ini *.chu *.ids *.bcs +EXTRA_DIST = *.2da *.bcs diff --git a/gemrb/override/iwd2/Makefile.am b/gemrb/override/iwd2/Makefile.am index 08aee09..5f0c923 100644 --- a/gemrb/override/iwd2/Makefile.am +++ b/gemrb/override/iwd2/Makefile.am @@ -1,3 +1,3 @@ -iwd2override_DATA = *.2da *.ini *.chu *.ids *.pro +iwd2override_DATA = *.2da iwd2overridedir = $(moddir)/override/iwd2/ -EXTRA_DIST = *.2da *.ini *.chu *.ids *.pro +EXTRA_DIST = *.2da diff --git a/gemrb/override/pst/Makefile.am b/gemrb/override/pst/Makefile.am index 1f148cc..f99b4a8 100644 --- a/gemrb/override/pst/Makefile.am +++ b/gemrb/override/pst/Makefile.am @@ -1,3 +1,3 @@ -pstoverride_DATA = *.2da *.bmp *.ini *.chu *.ids *.bcs *.pro +pstoverride_DATA = *.2da *.bcs pstoverridedir = $(moddir)/override/pst/ -EXTRA_DIST = *.2da *.bmp *.ini *.chu *.ids *.bcs *.pro +EXTRA_DIST = *.2da *.bcs diff --git a/gemrb/override/shared/Makefile.am b/gemrb/override/shared/Makefile.am index 752a81a..cfd0276 100644 --- a/gemrb/override/shared/Makefile.am +++ b/gemrb/override/shared/Makefile.am @@ -1,3 +1,3 @@ -sharedoverride_DATA = *.2da *.ids *.spl *.pro +sharedoverride_DATA = *.ids sharedoverridedir = $(moddir)/override/shared/ -EXTRA_DIST = *.2da *.ids *.spl *.pro +EXTRA_DIST = *.ids diff --git a/gemrb/unhardcoded/how/Makefile.am b/gemrb/unhardcoded/how/Makefile.am index 20227bc..d0c15fa 100644 --- a/gemrb/unhardcoded/how/Makefile.am +++ b/gemrb/unhardcoded/how/Makefile.am @@ -1,3 +1,3 @@ -howunhardcoded_DATA = *.2da *.ini *.chu *.ids *.spl *.pro *.bcs +howunhardcoded_DATA = *.2da *.ini *.chu *.ids *.spl *.pro howunhardcodeddir = $(moddir)/unhardcoded/how/ -EXTRA_DIST = *.2da *.ini *.chu *.ids *.spl *.pro *.bcs +EXTRA_DIST = *.2da *.ini *.chu *.ids *.spl *.pro diff --git a/gemrb/unhardcoded/iwd/Makefile.am b/gemrb/unhardcoded/iwd/Makefile.am index 28cdb42..f34f31a 100644 --- a/gemrb/unhardcoded/iwd/Makefile.am +++ b/gemrb/unhardcoded/iwd/Makefile.am @@ -1,3 +1,3 @@ -iwdunhardcoded_DATA = *.2da *.bmp *.ini *.chu *.ids *.bcs +iwdunhardcoded_DATA = *.2da *.bmp *.ini *.chu *.ids *.pro *.spl iwdunhardcodeddir = $(moddir)/unhardcoded/iwd/ -EXTRA_DIST = *.2da *.bmp *.ini *.chu *.ids *.bcs +EXTRA_DIST = *.2da *.bmp *.ini *.chu *.ids *.pro *.spl diff --git a/gemrb/unhardcoded/iwd2/Makefile.am b/gemrb/unhardcoded/iwd2/Makefile.am index 69fec71..a629f86 100644 --- a/gemrb/unhardcoded/iwd2/Makefile.am +++ b/gemrb/unhardcoded/iwd2/Makefile.am @@ -1,3 +1,3 @@ -iwd2unhardcoded_DATA = *.2da *.ini *.chu *.ids *.pro +iwd2unhardcoded_DATA = *.2da *.ini *.chu *.ids *.pro *.spl *.vvc *.eff iwd2unhardcodeddir = $(moddir)/unhardcoded/iwd2/ -EXTRA_DIST = *.2da *.ini *.chu *.ids *.pro +EXTRA_DIST = *.2da *.ini *.chu *.ids *.pro *.spl *.vvc *.eff diff --git a/gemrb/unhardcoded/pst/Makefile.am b/gemrb/unhardcoded/pst/Makefile.am index a58bc9c..87d2444 100644 --- a/gemrb/unhardcoded/pst/Makefile.am +++ b/gemrb/unhardcoded/pst/Makefile.am @@ -1,3 +1,3 @@ -pstunhardcoded_DATA = *.2da *.bmp *.ini *.chu *.ids *.bcs *.pro +pstunhardcoded_DATA = *.2da *.bmp *.ini *.chu *.ids *.pro *.spl *.vvc *.mos *.eff pstunhardcodeddir = $(moddir)/unhardcoded/pst/ -EXTRA_DIST = *.2da *.bmp *.ini *.chu *.ids *.bcs *.pro +EXTRA_DIST = *.2da *.bmp *.ini *.chu *.ids *.pro *.spl *.vvc *.mos *.eff diff --git a/gemrb/unhardcoded/shared/Makefile.am b/gemrb/unhardcoded/shared/Makefile.am index 6bf19df..bc41e17 100644 --- a/gemrb/unhardcoded/shared/Makefile.am +++ b/gemrb/unhardcoded/shared/Makefile.am @@ -1,3 +1,3 @@ -sharedunhardcoded_DATA = *.2da *.ids *.spl *.pro +sharedunhardcoded_DATA = *.2da *.ids *.spl *.pro *.chu *.ini *.vvc sharedunhardcodeddir = $(moddir)/unhardcoded/shared/ -EXTRA_DIST = *.2da *.ids *.spl *.pro +EXTRA_DIST = *.2da *.ids *.spl *.pro *.chu *.ini *.vvc ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |