# HG changeset patch
# User mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222
# Date 1289235133 0
# Node ID 0a798d5c241a8161ab14598b2d6f134deb5b7bd7
# Parent 61a5f86a0db351880cf2734eddb929a413cec0e2
Win32 build script updates to use the new Win32 November 2010 Devkit:
* Caution: Python 2.7 is now the officially supported Python version on Win32; Python 2.6 will work fine right now as well but you'll need to edit the builds scripts in this case; continue to use Py 2.6 at your own risk!
* Recommended Python 2.7 distro: http://downloads.activestate.com/ActivePython/releases/2.7.0.2/ActivePython-2.7.0.2-win32-x86.msi
* Win32 Devkit Nov2010 (.exe installer): http://sourceforge.net/projects/fife/files/active/sdks/FIFE_Development_Kit_Nov2010.exe/download
* Win32 Devkit Nov2010 (.zip version): http://sourceforge.net/projects/fife/files/active/sdks/FIFE_Development_Kit_Nov2010.zip/download
* A short announcement of the new devkit will be posted at the FIFE blog later today, with more information about the upgrade process, list of changes, etc.
diff -r 61a5f86a0db3 -r 0a798d5c241a build/win32-config.py
--- a/build/win32-config.py Mon Nov 08 15:46:48 2010 +0000
+++ b/build/win32-config.py Mon Nov 08 16:52:13 2010 +0000
@@ -30,7 +30,7 @@
path = os.getcwd()
- swigdir = os.path.join(path, 'build', 'win32', 'applications', 'swigwin-1.3.40')
+ swigdir = os.path.join(path, 'build', 'win32', 'applications', 'swigwin-2.0.1')
mingwbindir = os.path.join(path, 'build', 'win32', 'applications', 'mingw', 'bin')
env.PrependENVPath('PATH', swigdir)
@@ -39,8 +39,8 @@
includepath = os.path.join(path, 'build', 'win32', 'includes')
staticlibpath = os.path.join(path, 'build', 'win32', 'static_libs', 'mingw')
- 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++\\src'])
- env.Append(LIBPATH = [staticlibpath, staticlibpath + '\\python26'])
+ 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 + '\\python27', includepath + '\\unittest++\\src'])
+ env.Append(LIBPATH = [staticlibpath, staticlibpath + '\\python27'])
env.Tool('swig')
env.Tool('mingw')
@@ -52,9 +52,9 @@
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'])
if env['FIFE_DEBUG']:
- env.Append(LIBS = ['python26_d'])
+ env.Append(LIBS = ['python27_d'])
else:
- env.Append(LIBS = ['python26'])
+ env.Append(LIBS = ['python27'])
if opengl:
env.Prepend(LIBS = ['libguichan_opengl'])
diff -r 61a5f86a0db3 -r 0a798d5c241a build/win32/build_environments/code_blocks/engine_template.xml
--- a/build/win32/build_environments/code_blocks/engine_template.xml Mon Nov 08 15:46:48 2010 +0000
+++ b/build/win32/build_environments/code_blocks/engine_template.xml Mon Nov 08 16:52:13 2010 +0000
@@ -6,7 +6,7 @@
-
+
@@ -18,7 +18,7 @@
-
+
@@ -39,7 +39,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -83,7 +83,7 @@
-
+
@@ -95,7 +95,7 @@
-
+
diff -r 61a5f86a0db3 -r 0a798d5c241a build/win32/build_environments/visual_studio_8/engine_template.xml
--- a/build/win32/build_environments/visual_studio_8/engine_template.xml Mon Nov 08 15:46:48 2010 +0000
+++ b/build/win32/build_environments/visual_studio_8/engine_template.xml Mon Nov 08 16:52:13 2010 +0000
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
WholeProgramOptimization="false"
- 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"
+ AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\libguichan;..\..\includes\boost_1_38_0;..\..\includes\openal;..\..\includes\sdl;..\..\includes\zlib;..\..\includes\libvorbis;..\..\includes\libpng;..\..\includes\libogg;..\..\includes\python27;..\..\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"
@@ -63,9 +63,9 @@
/>
@@ -93,7 +93,7 @@