diff build/win32/build_environments/visual_studio_8/engine_template.xml @ 665:0a798d5c241a

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.
author mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222
date Mon, 08 Nov 2010 16:52:13 +0000
parents 64738befdf3b
children
line wrap: on
line diff
--- 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 @@
 			/>
 			<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"
+				AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl_d.lib sdlmain_d.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\python26"
+				AdditionalLibraryDirectories="..\..\static_libs\msvc2005;..\..\static_libs\msvc2005\python27"
 				IgnoreDefaultLibraryNames="libcmt.lib"
 				GenerateDebugInformation="true"
 			/>
@@ -93,7 +93,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Installing python files"
-				CommandLine="xcopy &quot;$(TargetPath)&quot; &quot;..\..\..\..\engine\python\fife&quot; /e /c /i /q /y&#x0D;&#x0A;xcopy &quot;..\..\binaries\msvc2005\*.dll&quot; &quot;..\..\..\..\engine\python\fife&quot; /e /c /i /q /y&#x0D;&#x0A;xcopy &quot;..\..\..\..\engine\python\fife&quot; &quot;C:\Python26\Lib\site-packages\fife&quot; /e /c /i /q /y&#x0D;&#x0A;"
+				CommandLine="xcopy &quot;$(TargetPath)&quot; &quot;..\..\..\..\engine\python\fife&quot; /e /c /i /q /y&#x0D;&#x0A;xcopy &quot;..\..\binaries\msvc2005\*.dll&quot; &quot;..\..\..\..\engine\python\fife&quot; /e /c /i /q /y&#x0D;&#x0A;xcopy &quot;..\..\..\..\engine\python\fife&quot; &quot;C:\python27\Lib\site-packages\fife&quot; /e /c /i /q /y&#x0D;&#x0A;del ..\..\..\..\engine\python\fife\SDL.dll&#x0D;&#x0A;del C:\python27\Lib\site-packages\fife\SDL.dll&#x0D;&#x0A;rename  ..\..\..\..\engine\python\fife\SDL_d.dll SDL.dll&#x0D;&#x0A;rename C:\python27\Lib\site-packages\fife\SDL_d.dll SDL.dll"
 			/>
 		</Configuration>
 		<Configuration
@@ -122,7 +122,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				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;_DEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -191,7 +191,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				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"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -257,7 +257,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				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"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -279,7 +279,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\msvc2005;..\..\static_libs\msvc2005\python26"
+				AdditionalLibraryDirectories="..\..\static_libs\msvc2005;..\..\static_libs\msvc2005\python27"
 				IgnoreDefaultLibraryNames="libcmt.lib"
 			/>
 			<Tool
@@ -306,7 +306,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Installing python files"
-				CommandLine="xcopy &quot;$(TargetPath)&quot; &quot;..\..\..\..\engine\python\fife&quot; /e /c /i /q /y&#x0D;&#x0A;xcopy &quot;..\..\binaries\msvc2005\*.dll&quot; &quot;..\..\..\..\engine\python\fife&quot; /e /c /i /q /y&#x0D;&#x0A;xcopy &quot;..\..\..\..\engine\python\fife&quot; &quot;C:\Python26\Lib\site-packages\fife&quot; /e /c /i /q /y"
+				CommandLine="xcopy &quot;$(TargetPath)&quot; &quot;..\..\..\..\engine\python\fife&quot; /e /c /i /q /y&#x0D;&#x0A;xcopy &quot;..\..\binaries\msvc2005\*.dll&quot; &quot;..\..\..\..\engine\python\fife&quot; /e /c /i /q /y&#x0D;&#x0A;xcopy &quot;..\..\..\..\engine\python\fife&quot; &quot;C:\python27\Lib\site-packages\fife&quot; /e /c /i /q /y"
 			/>
 		</Configuration>
 		<Configuration
@@ -336,7 +336,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"
@@ -357,9 +357,9 @@
 			/>
 			<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"
+				AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl_d.lib sdlmain_d.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_d.dll"
-				AdditionalLibraryDirectories="..\..\static_libs\msvc2005;..\..\static_libs\msvc2005\python26"
+				AdditionalLibraryDirectories="..\..\static_libs\msvc2005;..\..\static_libs\msvc2005\python27"
 				IgnoreDefaultLibraryNames="libcmt.lib"
 				GenerateDebugInformation="true"
 				ImportLibrary="$(OutDir)\$(ProjectName)_d.lib"
@@ -418,7 +418,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				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"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -440,7 +440,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)\$(ProjectName).dll"
-				AdditionalLibraryDirectories="..\..\static_libs\msvc2005;..\..\static_libs\msvc2005\python26"
+				AdditionalLibraryDirectories="..\..\static_libs\msvc2005;..\..\static_libs\msvc2005\python27"
 				IgnoreDefaultLibraryNames="libcmt.lib"
 				SupportUnloadOfDelayLoadedDLL="false"
 				ImportLibrary="$(OutDir)\$(ProjectName).lib"