Mercurial > fife-parpg
changeset 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 | 61a5f86a0db3 |
| children | 3944096d12ce |
| files | build/win32-config.py build/win32/build_environments/code_blocks/engine_template.xml build/win32/build_environments/visual_studio_8/engine_template.xml build/win32/build_environments/visual_studio_9/engine_template.xml |
| diffstat | 4 files changed, 40 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- 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'])
--- 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 @@ <Option makefile="SConstruct" /> <Option makefile_is_custom="1" /> <Option pch_mode="2" /> - <Option compiler="msvc8" /> + <MakeCommands> <Build command="" /> <CompileFile command="" /> @@ -18,7 +18,7 @@ <Option output="fife.cbp" prefix_auto="1" extension_auto="0" /> <Option object_output="obj\Debug\" /> <Option type="3" /> - <Option compiler="msvc8" /> + <Option createDefFile="1" /> <Compiler> <Add option="/Zi /D_DEBUG" /> @@ -39,7 +39,7 @@ <Option output="bin\Release\fife" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Release\" /> <Option type="3" /> - <Option compiler="msvc8" /> + <Option createDefFile="1" /> <Option createStaticLib="1" /> <Compiler> @@ -57,7 +57,7 @@ <Option output="fife" prefix_auto="1" extension_auto="1" /> <Option working_dir="" /> <Option type="2" /> - <Option compiler="msvc8" /> + <Option createDefFile="1" /> <MakeCommands> <Build command="python ../../applications/scons/scons.py -C ../../../../ -f $makefile --enable-debug fife-static" /> @@ -69,7 +69,7 @@ <Target title="Debug_shared"> <Option output="fife" prefix_auto="1" extension_auto="1" /> <Option type="3" /> - <Option compiler="msvc8" /> + <Option createDefFile="1" /> <Option createStaticLib="1" /> <MakeCommands> @@ -83,7 +83,7 @@ <Option output="fife" prefix_auto="1" extension_auto="1" /> <Option working_dir="" /> <Option type="2" /> - <Option compiler="msvc8" /> + <Option createDefFile="1" /> <MakeCommands> <Build command="python ../../applications/scons/scons.py -C ../../../../ -f $makefile fife-static" /> @@ -95,7 +95,7 @@ <Target title="Release_shared"> <Option output="fife" prefix_auto="1" extension_auto="1" /> <Option type="3" /> - <Option compiler="msvc8" /> + <Option createDefFile="1" /> <Option createStaticLib="1" /> <MakeCommands>
--- 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 "$(TargetPath)" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\binaries\msvc2005\*.dll" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\..\..\engine\python\fife" "C:\Python26\Lib\site-packages\fife" /e /c /i /q /y
" + CommandLine="xcopy "$(TargetPath)" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\binaries\msvc2005\*.dll" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\..\..\engine\python\fife" "C:\python27\Lib\site-packages\fife" /e /c /i /q /y
del ..\..\..\..\engine\python\fife\SDL.dll
del C:\python27\Lib\site-packages\fife\SDL.dll
rename ..\..\..\..\engine\python\fife\SDL_d.dll SDL.dll
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 "$(TargetPath)" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\binaries\msvc2005\*.dll" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\..\..\engine\python\fife" "C:\Python26\Lib\site-packages\fife" /e /c /i /q /y" + CommandLine="xcopy "$(TargetPath)" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\binaries\msvc2005\*.dll" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\..\..\engine\python\fife" "C:\python27\Lib\site-packages\fife" /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"
--- a/build/win32/build_environments/visual_studio_9/engine_template.xml Mon Nov 08 15:46:48 2010 +0000 +++ b/build/win32/build_environments/visual_studio_9/engine_template.xml Mon Nov 08 16:52:13 2010 +0000 @@ -44,7 +44,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" @@ -65,9 +65,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\msvc2008;..\..\static_libs\msvc2008\python26" + AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python27" IgnoreDefaultLibraryNames="libcmt.lib" GenerateDebugInformation="true" RandomizedBaseAddress="1" @@ -94,7 +94,7 @@ <Tool Name="VCPostBuildEventTool" Description="Installing python files" - CommandLine="xcopy "$(TargetPath)" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\binaries\msvc2008\*.dll" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\..\..\engine\python\fife" "C:\Python26\Lib\site-packages\fife" /e /c /i /q /y
" + CommandLine="xcopy "$(TargetPath)" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\binaries\msvc2008\*.dll" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\..\..\engine\python\fife" "C:\python27\Lib\site-packages\fife" /e /c /i /q /y
del ..\..\..\..\engine\python\fife\SDL.dll
del C:\python27\Lib\site-packages\fife\SDL.dll
rename ..\..\..\..\engine\python\fife\SDL_d.dll SDL.dll
rename C:\python27\Lib\site-packages\fife\SDL_d.dll SDL.dll" /> </Configuration> <Configuration @@ -123,7 +123,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" @@ -192,7 +192,7 @@ <Tool Name="VCCLCompilerTool" WholeProgramOptimization="True" - 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" @@ -260,7 +260,7 @@ Name="VCCLCompilerTool" Optimization="3" WholeProgramOptimization="True" - 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" @@ -282,7 +282,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\python26" + AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python27" IgnoreDefaultLibraryNames="libcmt.lib" /> <Tool @@ -309,7 +309,7 @@ <Tool Name="VCPostBuildEventTool" Description="Installing python files" - CommandLine="xcopy "$(TargetPath)" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\binaries\msvc2008\*.dll" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\..\..\engine\python\fife" "C:\Python26\Lib\site-packages\fife" /e /c /i /q /y" + CommandLine="xcopy "$(TargetPath)" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\binaries\msvc2008\*.dll" "..\..\..\..\engine\python\fife" /e /c /i /q /y
xcopy "..\..\..\..\engine\python\fife" "C:\python27\Lib\site-packages\fife" /e /c /i /q /y" /> </Configuration> <Configuration @@ -339,7 +339,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" @@ -360,9 +360,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\msvc2008;..\..\static_libs\msvc2008\python26" + AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python27" IgnoreDefaultLibraryNames="libcmt.lib" GenerateDebugInformation="true" ImportLibrary="$(OutDir)\$(ProjectName)_d.lib" @@ -421,7 +421,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" @@ -443,7 +443,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\msvc2008;..\..\static_libs\msvc2008\python26" + AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python27" IgnoreDefaultLibraryNames="libcmt.lib" SupportUnloadOfDelayLoadedDLL="false" RandomizedBaseAddress="1"