From: <ma...@us...> - 2009-07-21 19:06:33
|
Revision: 6118 http://exult.svn.sourceforge.net/exult/?rev=6118&view=rev Author: marzojr Date: 2009-07-21 19:06:19 +0000 (Tue, 21 Jul 2009) Log Message: ----------- * Changing version string to "svn" instead of "cvs" (bug #2822452). * SDL video driver on Mac OS X is set to x11 if Exult Studio support is on. Modified Paths: -------------- exult/trunk/ChangeLog exult/trunk/Makefile.common exult/trunk/configure.ac exult/trunk/content/bgkeyring/Keyring.cfg exult/trunk/content/data/Makefile.mingw exult/trunk/content/sifixes/sifixes.cfg exult/trunk/exult.cc exult/trunk/msvc9/msvc_kludges.h exult/trunk/msvcstuff/msvc_kludges.h exult/trunk/win32/exconfig.rc exult/trunk/win32/exultico.rc exult/trunk/win32/exultstudioico.rc Modified: exult/trunk/ChangeLog =================================================================== --- exult/trunk/ChangeLog 2009-07-20 04:34:57 UTC (rev 6117) +++ exult/trunk/ChangeLog 2009-07-21 19:06:19 UTC (rev 6118) @@ -1,3 +1,7 @@ +2009-07-21 Marzo Sette Torres Junior <ma...@ya...> + * Changing version string to "svn" instead of "cvs" (bug #2822452). + * SDL video driver on Mac OS X is set to x11 if Exult Studio support is on. + 2009-07-16 Dominik Reichardt <do...@us...> * Updated Documentation,FAQ and README.MacOSX Modified: exult/trunk/Makefile.common =================================================================== --- exult/trunk/Makefile.common 2009-07-20 04:34:57 UTC (rev 6117) +++ exult/trunk/Makefile.common 2009-07-21 19:06:19 UTC (rev 6118) @@ -6,7 +6,7 @@ $(SRC)/win32:$(SRC)/audio/midi_drivers/timidity:$(SRC)/audio/midi_drivers/mt32emu: \ $(SRC)/gamemgr -VERSION=1.4.05cvs +VERSION=1.4.05svn MAIN_OBJS=actions.o actorio.o actors.o args.o browser.o cheat.o cheat_screen.o \ combat.o delobjs.o dir.o drag.o effects.o exult.o exultico.o exultmenu.o \ Modified: exult/trunk/configure.ac =================================================================== --- exult/trunk/configure.ac 2009-07-20 04:34:57 UTC (rev 6117) +++ exult/trunk/configure.ac 2009-07-21 19:06:19 UTC (rev 6118) @@ -10,7 +10,7 @@ PACKAGE=exult VER_MAJOR=1 VER_MINOR=4 -VER_EXTRA=.05cvs +VER_EXTRA=.05svn VERSION=$VER_MAJOR.$VER_MINOR$VER_EXTRA # check host/target systems Modified: exult/trunk/content/bgkeyring/Keyring.cfg =================================================================== --- exult/trunk/content/bgkeyring/Keyring.cfg 2009-07-20 04:34:57 UTC (rev 6117) +++ exult/trunk/content/bgkeyring/Keyring.cfg 2009-07-21 19:06:19 UTC (rev 6118) @@ -4,7 +4,7 @@ KEYRING </display_string> <required_version> - 1.4.03cvs + 1.4.05svn </required_version> <patch> __MOD_PATH__/data @@ -12,4 +12,4 @@ <savegame_path> __MOD_PATH__/saves </savegame_path> -</mod_info> \ No newline at end of file +</mod_info> Modified: exult/trunk/content/data/Makefile.mingw =================================================================== --- exult/trunk/content/data/Makefile.mingw 2009-07-20 04:34:57 UTC (rev 6117) +++ exult/trunk/content/data/Makefile.mingw 2009-07-21 19:06:19 UTC (rev 6118) @@ -10,7 +10,7 @@ VPATH=$(SRC):$(SRC)/conf:$(SRC)/files:$(SRC)/imagewin:$(SRC)/shapes:$(SRC)/tools: \ $(SRC)/usecode:$(SRC)/usecode/compiler:$(SRC)/usecode/ucxt:$(SRC)/usecode/ucxt/src -CPPFLAGS=-DVERSION=\"1.4.05cvs\" -DEXULT_DATADIR=\"data\" -DDEBUG \ +CPPFLAGS=-DVERSION=\"1.4.05svn\" -DEXULT_DATADIR=\"data\" -DDEBUG \ -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -I. -I$(SRC)/imagewin -I$(SRC)/shapes \ -I$(SRC)/files -I$(SRC)/headers -I$(SRC)/tools -I$(SRC) -I$(SRC)/conf -I$(SRC)/usecode \ -I$(SRC)/usecode/ucxt/include -I$(SRC)/usecode/compiler -DHAVE_PNG_H Modified: exult/trunk/content/sifixes/sifixes.cfg =================================================================== --- exult/trunk/content/sifixes/sifixes.cfg 2009-07-20 04:34:57 UTC (rev 6117) +++ exult/trunk/content/sifixes/sifixes.cfg 2009-07-21 19:06:19 UTC (rev 6118) @@ -7,7 +7,7 @@ __MOD_PATH__/data </patch> <required_version> - 1.4.01cvs + 1.4.05svn </required_version> </modinfo> Modified: exult/trunk/exult.cc =================================================================== --- exult/trunk/exult.cc 2009-07-20 04:34:57 UTC (rev 6117) +++ exult/trunk/exult.cc 2009-07-21 19:06:19 UTC (rev 6118) @@ -656,6 +656,14 @@ // Maybe it would be best to use SDL_putenv instead? SDL_putenv("SDL_VIDEO_CENTERED=center"); // Yes, SDL_putenv is GOOD. putenv does NOT work with wince. -PTG 2007/06/11 +#elif defined(MACOSX) && defined(USE_EXULTSTUDIO) + // Just in case: + #ifndef XWIN + #error "Incompatible preprocessor definitions: simultaneous use of \"MACOSX\" and \"USE_EXULTSTUDIO\" require \"XWIN\" to be defined." + #endif + // Exult Studio support in Mac OS X is experimental and requires + // SDL to use X11. Hence, we force the issue. + SDL_putenv("SDL_VIDEODRIVER=x11"); #endif if (SDL_Init(init_flags) < 0) { Modified: exult/trunk/msvc9/msvc_kludges.h =================================================================== --- exult/trunk/msvc9/msvc_kludges.h 2009-07-20 04:34:57 UTC (rev 6117) +++ exult/trunk/msvc9/msvc_kludges.h 2009-07-21 19:06:19 UTC (rev 6118) @@ -14,7 +14,7 @@ #define HAVE_SSTREAM 1 // Firstly some things that need to be defined -#define VERSION "1.4.05cvs" +#define VERSION "1.4.05svn" #define EXULT_DATADIR "data/" #define SIZEOF_SHORT 2 #define SIZEOF_INT 4 Modified: exult/trunk/msvcstuff/msvc_kludges.h =================================================================== --- exult/trunk/msvcstuff/msvc_kludges.h 2009-07-20 04:34:57 UTC (rev 6117) +++ exult/trunk/msvcstuff/msvc_kludges.h 2009-07-21 19:06:19 UTC (rev 6118) @@ -14,7 +14,7 @@ #define HAVE_SSTREAM 1 // Firstly some things that need to be defined -#define VERSION "1.4.05cvs" +#define VERSION "1.4.05svn" #define EXULT_DATADIR "data/" #define SIZEOF_SHORT 2 #define SIZEOF_INT 4 Modified: exult/trunk/win32/exconfig.rc =================================================================== --- exult/trunk/win32/exconfig.rc 2009-07-20 04:34:57 UTC (rev 6117) +++ exult/trunk/win32/exconfig.rc 2009-07-21 19:06:19 UTC (rev 6118) @@ -17,8 +17,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,4,0,0 - PRODUCTVERSION 1,4,0,0 + FILEVERSION 1,4,5,0 + PRODUCTVERSION 1,4,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -36,14 +36,14 @@ VALUE "Comments", "\0" VALUE "CompanyName", "\0" VALUE "FileDescription", "Exult Config Helper DLL for InnoSetup\0" - VALUE "FileVersion", "1, 4, 0, 0\0" + VALUE "FileVersion", "1, 4, 5, 0\0" VALUE "InternalName", "exconfig\0" VALUE "LegalCopyright", "Copyright \xA9 2004\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "exconfig.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "Exult\0" - VALUE "ProductVersion", "1.4\0" + VALUE "ProductVersion", "1.4.05\0" VALUE "SpecialBuild", "\0" END END Modified: exult/trunk/win32/exultico.rc =================================================================== --- exult/trunk/win32/exultico.rc 2009-07-20 04:34:57 UTC (rev 6117) +++ exult/trunk/win32/exultico.rc 2009-07-21 19:06:19 UTC (rev 6118) @@ -47,12 +47,12 @@ BEGIN //VALUE "CompanyName", "The Exult Team\0" VALUE "FileDescription", "Exult Ultima VII Engine\0" - VALUE "FileVersion", "1.4.05cvs\0" + VALUE "FileVersion", "1.4.05svn\0" VALUE "InternalName", "Exult\0" VALUE "LegalCopyright", "Copyright \xA9 2004\0" VALUE "OriginalFilename", "Exult.exe\0" VALUE "ProductName", "Exult Ultima VII Engine\0" - VALUE "ProductVersion", "1.4.05cvs\0" + VALUE "ProductVersion", "1.4.05svn\0" END END BLOCK "VarFileInfo" Modified: exult/trunk/win32/exultstudioico.rc =================================================================== --- exult/trunk/win32/exultstudioico.rc 2009-07-20 04:34:57 UTC (rev 6117) +++ exult/trunk/win32/exultstudioico.rc 2009-07-21 19:06:19 UTC (rev 6118) @@ -43,12 +43,12 @@ BEGIN //VALUE "CompanyName", "The Exult Team\0" VALUE "FileDescription", "Exult Studio\0" - VALUE "FileVersion", "1.4.05cvs\0" + VALUE "FileVersion", "1.4.05svn\0" VALUE "InternalName", "Exult Studio\0" VALUE "LegalCopyright", "Copyright \xA9 2004\0" VALUE "OriginalFilename", "exult_studio.exe\0" VALUE "ProductName", "Exult Studio\0" - VALUE "ProductVersion", "1.4.05cvs\0" + VALUE "ProductVersion", "1.4.05svn\0" END END BLOCK "VarFileInfo" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |