Mercurial > fife-parpg
changeset 370:5ab78cd39534
* Updated win32 build files for the new November 2009 Win32 DevKit
* The old Win32 compile SDK 2008.1-r1 will NOT work with future revisions, starting with 3073
* For details, check this article that also contains the download links: http://fifengine.de/2009/11/16/new-fife-win32-devkit-available/
* Thanks to Cheesesucker for providing the installer version as well as for a bunch of smaller fixes to the build scripts
line wrap: on
line diff
--- a/build/win32-config-dist.py Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32-config-dist.py Mon Nov 16 12:29:29 2009 +0000 @@ -7,13 +7,13 @@ def addExtras(context): path = os.environ['_'] - includepath = path + '\\..\\..\\includes\\mingw' + includepath = path + '\\..\\..\\includes' staticlibpath = path + '\\..\\..\\static_libs\\mingw' - context.env.Append(CPPPATH = [includepath + '\\libogg', includepath + '\\openal', includepath + '\\sdl_image', includepath + '\\zlib', includepath + '\\libguichan', includepath + '\\boost_1_38_0', includepath + '\\libvorbis', includepath + '\\libpng', includepath + '\\sdl_ttf', includepath + '\\sdl', includepath + '\\python25', includepath + '\\unittest++']) - context.env.Append(LIBPATH = [staticlibpath, staticlibpath + '\\python25']) + context.env.Append(CPPPATH = [includepath + '\\libogg', includepath + '\\openal', includepath + '\\sdl_image', includepath + '\\zlib', includepath + '\\libguichan', includepath + '\\boost_1_38_0', includepath + '\\libvorbis', includepath + '\\libpng', includepath + '\\sdl_ttf', includepath + '\\sdl', includepath + '\\python26', includepath + '\\unittest++']) + context.env.Append(LIBPATH = [staticlibpath, staticlibpath + '\\python26']) - context.env.Append(LIBS = ['libguichan_sdl', 'libguichan', 'mingw32', 'zlib', 'vorbis', 'ogg', 'vorbisfile', 'libpng', 'SDL_image', 'SDLmain', 'SDL.dll', 'OpenAL32', 'SDL_ttf', 'boost_filesystem', 'boost_regex', 'boost_system', 'python25']) + context.env.Append(LIBS = ['libguichan_sdl', 'libguichan', 'mingw32', 'zlib', 'vorbis', 'ogg', 'vorbisfile', 'libpng', 'SDL_image', 'SDLmain', 'SDL.dll', 'OpenAL32', 'SDL_ttf', 'boost_filesystem', 'boost_regex', 'boost_system', 'python26']) if context.env['opengl']: context.env.Prepend(LIBS = ['libguichan_opengl'])
--- a/build/win32/build_environments/code_blocks/core_tests++.cbp Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/code_blocks/core_tests++.cbp Mon Nov 16 12:29:29 2009 +0000 @@ -32,19 +32,19 @@ <Add option="-Wall" /> <Add option="-fexceptions" /> <Add directory="..\..\..\..\engine\core" /> - <Add directory="..\..\includes\mingw\boost_1_35_0" /> - <Add directory="..\..\includes\mingw\libguichan" /> - <Add directory="..\..\includes\mingw\libogg" /> - <Add directory="..\..\includes\mingw\libpng" /> - <Add directory="..\..\includes\mingw\libvorbis" /> - <Add directory="..\..\includes\mingw\openal" /> - <Add directory="..\..\includes\mingw\physfs" /> - <Add directory="..\..\includes\mingw\python25" /> - <Add directory="..\..\includes\mingw\sdl" /> - <Add directory="..\..\includes\mingw\sdl_image" /> - <Add directory="..\..\includes\mingw\sdl_ttf" /> - <Add directory="..\..\includes\mingw\unittest++" /> - <Add directory="..\..\includes\mingw\zlib" /> + <Add directory="..\..\includes\boost_1_35_0" /> + <Add directory="..\..\includes\libguichan" /> + <Add directory="..\..\includes\libogg" /> + <Add directory="..\..\includes\libpng" /> + <Add directory="..\..\includes\libvorbis" /> + <Add directory="..\..\includes\openal" /> + <Add directory="..\..\includes\physfs" /> + <Add directory="..\..\includes\python26" /> + <Add directory="..\..\includes\sdl" /> + <Add directory="..\..\includes\sdl_image" /> + <Add directory="..\..\includes\sdl_ttf" /> + <Add directory="..\..\includes\unittest++" /> + <Add directory="..\..\includes\zlib" /> </Compiler> <Linker> <Add library="..\..\..\..\engine\libfife_static.a" /> @@ -66,7 +66,7 @@ <Add library="..\..\static_libs\mingw\SDL_image.lib" /> <Add library="..\..\static_libs\mingw\SDL_ttf.lib" /> <Add library="..\..\static_libs\mingw\libUnittest++.a" /> - <Add library="..\..\static_libs\mingw\python25\libpython25.a" /> + <Add library="..\..\static_libs\mingw\python26\libpython26.a" /> <Add library="opengl32" /> <Add library="glu32" /> </Linker>
--- a/build/win32/build_environments/code_blocks/engine_template.xml Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/code_blocks/engine_template.xml Mon Nov 16 12:29:29 2009 +0000 @@ -17,17 +17,17 @@ <Add option="-DLOG_ENABLED" /> <Add directory="..\..\..\..\engine" /> <Add directory="..\..\..\..\engine\core" /> - <Add directory="..\..\includes\mingw\boost_1_38_0" /> - <Add directory="..\..\includes\mingw\libguichan" /> - <Add directory="..\..\includes\mingw\libogg" /> - <Add directory="..\..\includes\mingw\libpng" /> - <Add directory="..\..\includes\mingw\libvorbis" /> - <Add directory="..\..\includes\mingw\openal" /> - <Add directory="..\..\includes\mingw\python25" /> - <Add directory="..\..\includes\mingw\sdl" /> - <Add directory="..\..\includes\mingw\sdl_image" /> - <Add directory="..\..\includes\mingw\sdl_ttf" /> - <Add directory="..\..\includes\mingw\zlib" /> + <Add directory="..\..\includes\boost_1_38_0" /> + <Add directory="..\..\includes\libguichan" /> + <Add directory="..\..\includes\libogg" /> + <Add directory="..\..\includes\libpng" /> + <Add directory="..\..\includes\libvorbis" /> + <Add directory="..\..\includes\openal" /> + <Add directory="..\..\includes\python26" /> + <Add directory="..\..\includes\sdl" /> + <Add directory="..\..\includes\sdl_image" /> + <Add directory="..\..\includes\sdl_ttf" /> + <Add directory="..\..\includes\zlib" /> </Compiler> <Linker> <Add library="..\..\static_libs\mingw\libguichan_opengl.a" /> @@ -49,7 +49,7 @@ <Add library="..\..\static_libs\mingw\libboost_system.a" /> <Add library="..\..\applications\mingw\lib\libopengl32.a" /> <Add library="..\..\applications\mingw\lib\libglu32.a" /> - <Add library="..\..\static_libs\mingw\python25\libpython25.a" /> + <Add library="..\..\static_libs\mingw\python26\libpython26.a" /> </Linker> </Target> </Build>
--- a/build/win32/build_environments/scons/build_engine.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/scons/build_engine.bat Mon Nov 16 12:29:29 2009 +0000 @@ -1,6 +1,6 @@ :: Users will need to change paths if they use custom MinGW, SCons, Python or SWIG versions that didn't ship with the SDK SET _=%CD% -SET _SWIG="%_%\..\..\applications\swigwin-1.3.38" +SET _SWIG="%_%\..\..\applications\swigwin-1.3.40" :: To avoid path collisions the following line was commented out and replaced with a slightly different version :: SET PATH=%Path%;%_%\applications\scons;%_%\applications\mingw\bin
--- a/build/win32/build_environments/scons/build_engine_debug.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/scons/build_engine_debug.bat Mon Nov 16 12:29:29 2009 +0000 @@ -1,6 +1,6 @@ :: Users will need to change paths if they use custom MinGW, SCons, Python or SWIG versions that didn't ship with the SDK SET _=%CD% -SET _SWIG="%_%\..\..\applications\swigwin-1.3.38" +SET _SWIG="%_%\..\..\applications\swigwin-1.3.40" :: To avoid path collisions the following line was commented out and replaced with a slightly different version :: SET PATH=%Path%;%_%\applications\scons;%_%\applications\mingw\bin
--- a/build/win32/build_environments/scons/build_engine_nolog.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/scons/build_engine_nolog.bat Mon Nov 16 12:29:29 2009 +0000 @@ -1,6 +1,6 @@ :: Users will need to change paths if they use custom MinGW, SCons, Python or SWIG versions that didn't ship with the SDK SET _=%CD% -SET _SWIG="%_%\..\..\applications\swigwin-1.3.38" +SET _SWIG="%_%\..\..\applications\swigwin-1.3.40" :: To avoid path collisions the following line was commented out and replaced with a slightly different version :: SET PATH=%Path%;%_%\applications\scons;%_%\applications\mingw\bin
--- a/build/win32/build_environments/scons/build_tests.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/scons/build_tests.bat Mon Nov 16 12:29:29 2009 +0000 @@ -1,6 +1,6 @@ :: Users will need to change paths if they use custom MinGW, SCons, Python or SWIG versions that didn't ship with the SDK SET _=%CD% -SET _SWIG="%_%\..\..\applications\swigwin-1.3.38" +SET _SWIG="%_%\..\..\applications\swigwin-1.3.40" :: To avoid path collisions the following line was commented out and replaced with a slightly different version :: SET PATH=%Path%;%_%\applications\scons;%_%\applications\mingw\bin
--- a/build/win32/build_environments/scons/cleanup_engine.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/scons/cleanup_engine.bat Mon Nov 16 12:29:29 2009 +0000 @@ -1,6 +1,6 @@ :: Users will need to change paths if they use custom MinGW, SCons, Python or SWIG versions that didn't ship with the SDK SET _=%CD% -SET _SWIG="%_%\..\..\applications\swigwin-1.3.38" +SET _SWIG="%_%\..\..\applications\swigwin-1.3.40" :: To avoid path collisions the following line was commented out and replaced with a slightly different version :: SET PATH=%Path%;%_%\applications\scons;%_%\applications\mingw\bin
--- a/build/win32/build_environments/scons/list_scons_args.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/scons/list_scons_args.bat Mon Nov 16 12:29:29 2009 +0000 @@ -1,6 +1,6 @@ :: Users will need to change paths if they use custom MinGW, SCons, Python or SWIG versions that didn't ship with the SDK SET _=%CD% -SET _SWIG="%_%\..\..\applications\swigwin-1.3.38" +SET _SWIG="%_%\..\..\applications\swigwin-1.3.40" :: To avoid path collisions the following line was commented out and replaced with a slightly different version :: SET PATH=%Path%;%_%\applications\scons;%_%\applications\mingw\bin
--- a/build/win32/build_environments/scons/logbuild_engine.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/scons/logbuild_engine.bat Mon Nov 16 12:29:29 2009 +0000 @@ -1,6 +1,6 @@ :: Users will need to change paths if they use custom MinGW, SCons, Python or SWIG versions that didn't ship with the SDK SET _=%CD% -SET _SWIG="%_%\..\..\applications\swigwin-1.3.38" +SET _SWIG="%_%\..\..\applications\swigwin-1.3.40" :: To avoid path collisions the following line was commented out and replaced with a slightly different version :: SET PATH=%Path%;%_%\applications\scons;%_%\applications\mingw\bin
--- a/build/win32/build_environments/scons/logbuild_engine_debug.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/scons/logbuild_engine_debug.bat Mon Nov 16 12:29:29 2009 +0000 @@ -1,6 +1,6 @@ :: Users will need to change paths if they use custom MinGW, SCons, Python or SWIG versions that didn't ship with the SDK SET _=%CD% -SET _SWIG="%_%\..\..\applications\swigwin-1.3.38" +SET _SWIG="%_%\..\..\applications\swigwin-1.3.40" :: To avoid path collisions the following line was commented out and replaced with a slightly different version :: SET PATH=%Path%;%_%\applications\scons;%_%\applications\mingw\bin
--- a/build/win32/build_environments/scons/logbuild_engine_nolog.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/scons/logbuild_engine_nolog.bat Mon Nov 16 12:29:29 2009 +0000 @@ -1,6 +1,6 @@ :: Users will need to change paths if they use custom MinGW, SCons, Python or SWIG versions that didn't ship with the SDK SET _=%CD% -SET _SWIG="%_%\..\..\applications\swigwin-1.3.38" +SET _SWIG="%_%\..\..\applications\swigwin-1.3.40" :: To avoid path collisions the following line was commented out and replaced with a slightly different version :: SET PATH=%Path%;%_%\applications\scons;%_%\applications\mingw\bin
--- a/build/win32/build_environments/scons/logbuild_tests.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/scons/logbuild_tests.bat Mon Nov 16 12:29:29 2009 +0000 @@ -1,6 +1,6 @@ :: Users will need to change paths if they use custom MinGW, SCons, Python or SWIG versions that didn't ship with the SDK SET _=%CD% -SET _SWIG="%_%\..\..\applications\swigwin-1.3.38" +SET _SWIG="%_%\..\..\applications\swigwin-1.3.40" :: To avoid path collisions the following line was commented out and replaced with a slightly different version :: SET PATH=%Path%;%_%\applications\scons;%_%\applications\mingw\bin
--- a/build/win32/build_environments/visual_studio_8/engine_template.xml Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/visual_studio_8/engine_template.xml Mon Nov 16 12:29:29 2009 +0000 @@ -24,7 +24,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2005\libguichan;..\..\includes\msvc2005\boost_1_38_0;..\..\includes\msvc2005\openal;..\..\includes\msvc2005\sdl;..\..\includes\msvc2005\zlib;..\..\includes\msvc2005\libvorbis;..\..\includes\msvc2005\libpng;..\..\includes\msvc2005\libogg;..\..\includes\msvc2005\python25;..\..\includes\msvc2005\sdl_image;..\..\includes\msvc2005\sdl_ttf" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\libguichan;..\..\includes\boost_1_38_0;..\..\includes\openal;..\..\includes\sdl;..\..\includes\zlib;..\..\includes\libvorbis;..\..\includes\libpng;..\..\includes\libogg;..\..\includes\python26;..\..\includes\sdl_image;..\..\includes\sdl_ttf" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" MinimalRebuild="true" RuntimeLibrary="2" @@ -40,7 +40,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl.lib sdlmain.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib" OutputFile="$(OutDir)\_fife.pyd" - AdditionalLibraryDirectories="..\..\static_libs\msvc2005;..\..\static_libs\msvc2005\python25" + AdditionalLibraryDirectories="..\..\static_libs\msvc2005;..\..\static_libs\msvc2005\python26" IgnoreDefaultLibraryNames="libcmt.lib" GenerateDebugInformation="true" /> @@ -71,7 +71,7 @@ <Tool Name="VCMIDLTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2005\libguichan;..\..\includes\msvc2005\boost_1_38_0;..\..\includes\msvc2005\openal;..\..\includes\msvc2005\sdl;..\..\includes\msvc2005\zlib;..\..\includes\msvc2005\libvorbis;..\..\includes\msvc2005\libpng;..\..\includes\msvc2005\libogg;..\..\includes\msvc2005\python25;..\..\includes\msvc2005\sdl_image;..\..\includes\msvc2005\sdl_ttf" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\libguichan;..\..\includes\boost_1_38_0;..\..\includes\openal;..\..\includes\sdl;..\..\includes\zlib;..\..\includes\libvorbis;..\..\includes\libpng;..\..\includes\libogg;..\..\includes\python26;..\..\includes\sdl_image;..\..\includes\sdl_ttf" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -111,7 +111,7 @@ <Tool Name="VCMIDLTool"/> <Tool Name="VCCLCompilerTool" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2005\libguichan;..\..\includes\msvc2005\boost_1_38_0;..\..\includes\msvc2005\openal;..\..\includes\msvc2005\sdl;..\..\includes\msvc2005\zlib;..\..\includes\msvc2005\libvorbis;..\..\includes\msvc2005\libpng;..\..\includes\msvc2005\libogg;..\..\includes\msvc2005\python25;..\..\includes\msvc2005\sdl_image;..\..\includes\msvc2005\sdl_ttf" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\libguichan;..\..\includes\boost_1_38_0;..\..\includes\openal;..\..\includes\sdl;..\..\includes\zlib;..\..\includes\libvorbis;..\..\includes\libpng;..\..\includes\libogg;..\..\includes\python26;..\..\includes\sdl_image;..\..\includes\sdl_ttf" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -151,7 +151,7 @@ <Tool Name="VCMIDLTool"/> <Tool Name="VCCLCompilerTool" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2005\libguichan;..\..\includes\msvc2005\boost_1_38_0;..\..\includes\msvc2005\openal;..\..\includes\msvc2005\sdl;..\..\includes\msvc2005\zlib;..\..\includes\msvc2005\libvorbis;..\..\includes\msvc2005\libpng;..\..\includes\msvc2005\libogg;..\..\includes\msvc2005\python25;..\..\includes\msvc2005\sdl_image;..\..\includes\msvc2005\sdl_ttf" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\libguichan;..\..\includes\boost_1_38_0;..\..\includes\openal;..\..\includes\sdl;..\..\includes\zlib;..\..\includes\libvorbis;..\..\includes\libpng;..\..\includes\libogg;..\..\includes\python26;..\..\includes\sdl_image;..\..\includes\sdl_ttf" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -166,7 +166,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl.lib sdlmain.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib" OutputFile="$(OutDir)\_fife.pyd" - AdditionalLibraryDirectories="..\..\static_libs\msvc2005;..\..\static_libs\msvc2005\python25" + AdditionalLibraryDirectories="..\..\static_libs\msvc2005;..\..\static_libs\msvc2005\python26" IgnoreDefaultLibraryNames="libcmt.lib" /> <Tool Name="VCALinkTool"/>
--- a/build/win32/build_environments/visual_studio_8/unittest_template.xml Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/visual_studio_8/unittest_template.xml Mon Nov 16 12:29:29 2009 +0000 @@ -21,7 +21,7 @@ <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCMIDLTool"/> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\..\engine;..\..\..\..\..\engine\core;..\includes;..\..\..\includes\msvc2005\libguichan;..\..\..\includes\msvc2005\unittest++;..\..\..\includes\msvc2005\libogg;..\..\..\includes\msvc2005\openal-soft;..\..\..\includes\msvc2005\sdl;..\..\..\includes\msvc2005\sdl_image;..\..\..\includes\msvc2005\sdl_ttf;..\..\..\includes\msvc2005\zlib;..\..\..\includes\msvc2005\libvorbis;..\..\..\includes\msvc2005\libpng;..\..\..\includes\msvc2005\python;..\..\..\includes\msvc2005\boost_1_38_0" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4"/> + <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\..\engine;..\..\..\..\..\engine\core;..\includes;..\..\..\includes\libguichan;..\..\..\includes\unittest++;..\..\..\includes\libogg;..\..\..\includes\openal-soft;..\..\..\includes\sdl;..\..\..\includes\sdl_image;..\..\..\includes\sdl_ttf;..\..\..\includes\zlib;..\..\..\includes\libvorbis;..\..\..\includes\libpng;..\..\..\includes\python;..\..\..\includes\boost_1_38_0" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCPreLinkEventTool"/> @@ -41,7 +41,7 @@ <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCMIDLTool"/> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\..\engine;..\..\..\..\..\engine\core;..\includes;..\..\..\includes\msvc2005\libguichan;..\..\..\includes\msvc2005\unittest++;..\..\..\includes\msvc2005\libogg;..\..\..\includes\msvc2005\openal-soft;..\..\..\includes\msvc2005\sdl;..\..\..\includes\msvc2005\sdl_image;..\..\..\includes\msvc2005\sdl_ttf;..\..\..\includes\msvc2005\zlib;..\..\..\includes\msvc2005\libvorbis;..\..\..\includes\msvc2005\libpng;..\..\..\includes\msvc2005\python25;..\..\..\includes\msvc2005\boost_1_38_0" PreprocessorDefinitions="WIN32;_CONSOLE" MinimalRebuild="true" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="3"/> + <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\..\engine;..\..\..\..\..\engine\core;..\includes;..\..\..\includes\libguichan;..\..\..\includes\unittest++;..\..\..\includes\libogg;..\..\..\includes\openal-soft;..\..\..\includes\sdl;..\..\..\includes\sdl_image;..\..\..\includes\sdl_ttf;..\..\..\includes\zlib;..\..\..\includes\libvorbis;..\..\..\includes\libpng;..\..\..\includes\python26;..\..\..\includes\boost_1_38_0" PreprocessorDefinitions="WIN32;_CONSOLE" MinimalRebuild="true" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="3"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCPreLinkEventTool"/>
--- a/build/win32/build_environments/visual_studio_9/Fife_UnitTest.vcproj Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/visual_studio_9/Fife_UnitTest.vcproj Mon Nov 16 12:29:29 2009 +0000 @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2008\libguichan;..\..\includes\msvc2008\boost_1_38_0;..\..\includes\msvc2008\openal;..\..\includes\msvc2008\sdl;..\..\includes\msvc2008\zlib;..\..\includes\msvc2008\libvorbis;..\..\includes\msvc2008\libpng;..\..\includes\msvc2008\libogg;..\..\includes\msvc2008\python25;..\..\includes\msvc2008\sdl_image;..\..\includes\msvc2008\sdl_ttf;"..\..\includes\msvc2008\unittest++"" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\libguichan;..\..\includes\boost_1_38_0;..\..\includes\openal;..\..\includes\sdl;..\..\includes\zlib;..\..\includes\libvorbis;..\..\includes\libpng;..\..\includes\libogg;..\..\includes\python26;..\..\includes\sdl_image;..\..\includes\sdl_ttf;"..\..\includes\unittest++"" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" MinimalRebuild="true" BasicRuntimeChecks="0" @@ -65,7 +65,7 @@ Name="VCLinkerTool" AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl.lib sdlmain.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib UnitTest++.lib libfife.lib" LinkIncremental="2" - AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python25;..\..\..\..\engine\swigwrappers\python" + AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python26;..\..\..\..\engine\swigwrappers\python" IgnoreDefaultLibraryNames="libcmt.lib" GenerateDebugInformation="true" SubSystem="1"
--- a/build/win32/build_environments/visual_studio_9/engine_template.xml Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/build_environments/visual_studio_9/engine_template.xml Mon Nov 16 12:29:29 2009 +0000 @@ -44,7 +44,7 @@ Name="VCCLCompilerTool" Optimization="0" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2008\libguichan;..\..\includes\msvc2008\boost_1_38_0;..\..\includes\msvc2008\openal;..\..\includes\msvc2008\sdl;..\..\includes\msvc2008\zlib;..\..\includes\msvc2008\libvorbis;..\..\includes\msvc2008\libpng;..\..\includes\msvc2008\libogg;..\..\includes\msvc2008\python25;..\..\includes\msvc2008\sdl_image;..\..\includes\msvc2008\sdl_ttf" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\libguichan;..\..\includes\boost_1_38_0;..\..\includes\openal;..\..\includes\sdl;..\..\includes\zlib;..\..\includes\libvorbis;..\..\includes\libpng;..\..\includes\libogg;..\..\includes\python26;..\..\includes\sdl_image;..\..\includes\sdl_ttf" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" MinimalRebuild="true" RuntimeLibrary="2" @@ -67,7 +67,7 @@ Name="VCLinkerTool" AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl.lib sdlmain.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib" OutputFile="$(OutDir)\_fife.pyd" - AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python25" + AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python26" IgnoreDefaultLibraryNames="libcmt.lib" GenerateDebugInformation="true" RandomizedBaseAddress="1" @@ -122,7 +122,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2008\libguichan;..\..\includes\msvc2008\boost_1_38_0;..\..\includes\msvc2008\openal;..\..\includes\msvc2008\sdl;..\..\includes\msvc2008\zlib;..\..\includes\msvc2008\libvorbis;..\..\includes\msvc2008\libpng;..\..\includes\msvc2008\libogg;..\..\includes\msvc2008\python25;..\..\includes\msvc2008\sdl_image;..\..\includes\msvc2008\sdl_ttf" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\libguichan;..\..\includes\boost_1_38_0;..\..\includes\openal;..\..\includes\sdl;..\..\includes\zlib;..\..\includes\libvorbis;..\..\includes\libpng;..\..\includes\libogg;..\..\includes\python26;..\..\includes\sdl_image;..\..\includes\sdl_ttf" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -189,7 +189,7 @@ <Tool Name="VCCLCompilerTool" WholeProgramOptimization="True" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2008\libguichan;..\..\includes\msvc2008\boost_1_38_0;..\..\includes\msvc2008\openal;..\..\includes\msvc2008\sdl;..\..\includes\msvc2008\zlib;..\..\includes\msvc2008\libvorbis;..\..\includes\msvc2008\libpng;..\..\includes\msvc2008\libogg;..\..\includes\msvc2008\python25;..\..\includes\msvc2008\sdl_image;..\..\includes\msvc2008\sdl_ttf" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\libguichan;..\..\includes\boost_1_38_0;..\..\includes\openal;..\..\includes\sdl;..\..\includes\zlib;..\..\includes\libvorbis;..\..\includes\libpng;..\..\includes\libogg;..\..\includes\python26;..\..\includes\sdl_image;..\..\includes\sdl_ttf" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -255,7 +255,7 @@ Name="VCCLCompilerTool" Optimization="3" WholeProgramOptimization="True" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2008\libguichan;..\..\includes\msvc2008\boost_1_38_0;..\..\includes\msvc2008\openal;..\..\includes\msvc2008\sdl;..\..\includes\msvc2008\zlib;..\..\includes\msvc2008\libvorbis;..\..\includes\msvc2008\libpng;..\..\includes\msvc2008\libogg;..\..\includes\msvc2008\python25;..\..\includes\msvc2008\sdl_image;..\..\includes\msvc2008\sdl_ttf" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\libguichan;..\..\includes\boost_1_38_0;..\..\includes\openal;..\..\includes\sdl;..\..\includes\zlib;..\..\includes\libvorbis;..\..\includes\libpng;..\..\includes\libogg;..\..\includes\python26;..\..\includes\sdl_image;..\..\includes\sdl_ttf" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -277,7 +277,7 @@ Name="VCLinkerTool" AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl.lib sdlmain.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib" OutputFile="$(OutDir)\_fife.pyd" - AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python25" + AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python26" IgnoreDefaultLibraryNames="libcmt.lib" RandomizedBaseAddress="1" DataExecutionPrevention="0"
--- a/build/win32/create_documentation.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/create_documentation.bat Mon Nov 16 12:29:29 2009 +0000 @@ -1,6 +1,6 @@ :: Users will need to change paths if they use custom MinGW, SCons, Python or SWIG versions that didn't ship with the SDK SET _=%CD% -SET _SWIG="%_%\applications\swigwin-1.3.38" +SET _SWIG="%_%\applications\swigwin-1.3.40" :: To avoid path collisions the following line was commented out and replaced with a slightly different version :: SET PATH=%Path%;%_%\applications\scons;%_%\applications\mingw\bin
--- a/build/win32/update_dlls_mingw.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/update_dlls_mingw.bat Mon Nov 16 12:29:29 2009 +0000 @@ -3,7 +3,5 @@ del .\..\..\clients\pychan_demo\*.dll del .\..\..\clients\rio_de_hola\*.dll -copy .\binaries\mingw\*.dll .\..\..\*.* -copy .\binaries\mingw\*.dll .\..\..\clients\editor\*.* -copy .\binaries\mingw\*.dll .\..\..\clients\pychan_demo\*.* -copy .\binaries\mingw\*.dll .\..\..\clients\rio_de_hola\*.* +del .\..\..\engine\swigwrappers\python\*.dll +copy .\binaries\mingw\*.dll .\..\..\engine\swigwrappers\python\*.*
--- a/build/win32/update_dlls_msvc2005.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/update_dlls_msvc2005.bat Mon Nov 16 12:29:29 2009 +0000 @@ -1,9 +1,7 @@ del .\..\..\*.dll del .\..\..\clients\editor\*.dll -del .\..\..\clients\island_demo\*.dll +del .\..\..\clients\rio_de_hola\*.dll del .\..\..\clients\pychan_demo\*.dll -copy .\binaries\msvc2005\*.dll .\..\..\*.* -copy .\binaries\msvc2005\*.dll .\..\..\clients\editor\*.* -copy .\binaries\msvc2005\*.dll .\..\..\clients\pychan_demo\*.* -copy .\binaries\msvc2005\*.dll .\..\..\clients\rio_de_hola\*.* +del .\..\..\engine\swigwrappers\python\*.dll +copy .\binaries\msvc2005\*.dll .\..\..\engine\swigwrappers\python\*.*
--- a/build/win32/update_dlls_msvc2008.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/update_dlls_msvc2008.bat Mon Nov 16 12:29:29 2009 +0000 @@ -1,9 +1,7 @@ del .\..\..\*.dll del .\..\..\clients\editor\*.dll -del .\..\..\clients\island_demo\*.dll +del .\..\..\clients\rio_de_hola\*.dll del .\..\..\clients\pychan_demo\*.dll -copy .\binaries\msvc2008\*.dll .\..\..\*.* -copy .\binaries\msvc2008\*.dll .\..\..\clients\editor\*.* -copy .\binaries\msvc2008\*.dll .\..\..\clients\pychan_demo\*.* -copy .\binaries\msvc2008\*.dll .\..\..\clients\rio_de_hola\*.* +del .\..\..\engine\swigwrappers\python\*.dll +copy .\binaries\msvc2008\*.dll .\..\..\engine\swigwrappers\python\*.*
--- a/build/win32/update_project_files.bat Sat Nov 14 18:09:13 2009 +0000 +++ b/build/win32/update_project_files.bat Mon Nov 16 12:29:29 2009 +0000 @@ -1,6 +1,6 @@ :: Users will need to change paths if they use custom MinGW, SCons, Python or SWIG versions that didn't ship with the SDK SET _=%CD% -SET _SWIG="%_%\applications\swigwin-1.3.38" +SET _SWIG="%_%\applications\swigwin-1.3.40" :: To avoid path collisions the following line was commented out and replaced with a slightly different version :: SET PATH=%Path%;%_%\applications\scons;%_%\applications\mingw\bin