Mercurial > fife-parpg
changeset 688:ae479ce3f762
Win32 build system:
* Fixed a build error on updating project files. This was caused by not installing the mingw part in the devkit installer.
* Updated some references to python26 to python27
| author | cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 |
|---|---|
| date | Sun, 23 Jan 2011 17:19:00 +0000 |
| parents | 55c1baa3cb48 |
| children | f67e9f47526d |
| files | build/win32/build_environments/code_blocks/core_tests++.cbp build/win32/build_environments/scons/copy_dlls.bat build/win32/build_environments/visual_studio_8/unittest_template.xml build/win32/build_environments/visual_studio_9/Fife_UnitTest.vcproj engine/SConscript |
| diffstat | 5 files changed, 13 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/build/win32/build_environments/code_blocks/core_tests++.cbp Mon Dec 06 21:47:14 2010 +0000 +++ b/build/win32/build_environments/code_blocks/core_tests++.cbp Sun Jan 23 17:19:00 2011 +0000 @@ -39,7 +39,7 @@ <Add directory="..\..\includes\libvorbis" /> <Add directory="..\..\includes\openal" /> <Add directory="..\..\includes\physfs" /> - <Add directory="..\..\includes\python26" /> + <Add directory="..\..\includes\python27" /> <Add directory="..\..\includes\sdl" /> <Add directory="..\..\includes\sdl_image" /> <Add directory="..\..\includes\sdl_ttf" /> @@ -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\python26\libpython26.a" /> + <Add library="..\..\static_libs\mingw\python27\libpython27.a" /> <Add library="opengl32" /> <Add library="glu32" /> </Linker>
--- a/build/win32/build_environments/scons/copy_dlls.bat Mon Dec 06 21:47:14 2010 +0000 +++ b/build/win32/build_environments/scons/copy_dlls.bat Sun Jan 23 17:19:00 2011 +0000 @@ -2,8 +2,8 @@ if not defined xcopy goto :noxcopy xcopy "..\..\binaries\mingw\*.dll" "..\..\..\..\engine\python\fife" /e /c /i /q /y -if "%1" == "install" xcopy "..\..\binaries\mingw\*.dll" "C:\Python26\Lib\site-packages\fife" /e /c /i /q /y +if "%1" == "install" xcopy "..\..\binaries\mingw\*.dll" "C:\Python27\Lib\site-packages\fife" /e /c /i /q /y :noxcopy %SystemRoot%\system32\xcopy "..\..\binaries\mingw\*.dll" "..\..\..\..\engine\python\fife" /e /c /i /q /y -if "%1" == "install" %SystemRoot%\system32\xcopy "..\..\binaries\mingw\*.dll" "C:\Python26\Lib\site-packages\fife" /e /c /i /q /y +if "%1" == "install" %SystemRoot%\system32\xcopy "..\..\binaries\mingw\*.dll" "C:\Python27\Lib\site-packages\fife" /e /c /i /q /y
--- a/build/win32/build_environments/visual_studio_8/unittest_template.xml Mon Dec 06 21:47:14 2010 +0000 +++ b/build/win32/build_environments/visual_studio_8/unittest_template.xml Sun Jan 23 17:19:00 2011 +0000 @@ -41,7 +41,7 @@ <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCMIDLTool"/> - <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="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\python27;..\..\..\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 Mon Dec 06 21:47:14 2010 +0000 +++ b/build/win32/build_environments/visual_studio_9/Fife_UnitTest.vcproj Sun Jan 23 17:19:00 2011 +0000 @@ -41,7 +41,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;"..\..\includes\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\python27;..\..\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\python26;..\..\..\..\engine\swigwrappers\python" + AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python27;..\..\..\..\engine\swigwrappers\python" IgnoreDefaultLibraryNames="libcmt.lib" GenerateDebugInformation="true" SubSystem="1"
--- a/engine/SConscript Mon Dec 06 21:47:14 2010 +0000 +++ b/engine/SConscript Sun Jan 23 17:19:00 2011 +0000 @@ -58,10 +58,13 @@ if sys.platform == 'win32': dllpath = upath(opts['DLLPATH']) - dllfilelist = list(dllpath.walkfiles('*.dll')) + dllfilelist = list() dllfiles = list() - for f in dllfilelist: - dllfiles.append(utils.relpath(f,opts['DLLPATH'])) + + if os.path.isdir(dllpath): + dllfilelist = list(dllpath.walkfiles('*.dll')) + for f in dllfilelist: + dllfiles.append(utils.relpath(f,opts['DLLPATH']))