Mercurial > fife-parpg
changeset 387:847c6ec4544e
Fixed the scons batch files (win32).
Core tests now compile on windows but fail to link.
line wrap: on
line diff
--- a/build/win32-config.py Thu Jan 21 21:22:45 2010 +0000 +++ b/build/win32-config.py Fri Jan 22 19:03:43 2010 +0000 @@ -16,7 +16,7 @@ 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++']) + 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.Tool('swig')
--- a/build/win32/build_environments/scons/build_engine.bat Thu Jan 21 21:22:45 2010 +0000 +++ b/build/win32/build_environments/scons/build_engine.bat Fri Jan 22 19:03:43 2010 +0000 @@ -1,20 +1,7 @@ @echo off -:: 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.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 -SET PATH=%_%\..\..\applications\scons;%_%\..\..\applications\mingw\bin;c:\python25 - -:: Goto TRUNK and call SCons -cd \ -cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py fife-python - -:: Return us to the directory we started from -cd %_% +:: run scons +python ..\..\applications\scons\scons.py -C ..\..\..\..\ fife-python :: copy the needed dlls to the path where fife was installed call copy_dlls.bat
--- a/build/win32/build_environments/scons/build_engine_debug.bat Thu Jan 21 21:22:45 2010 +0000 +++ b/build/win32/build_environments/scons/build_engine_debug.bat Fri Jan 22 19:03:43 2010 +0000 @@ -1,20 +1,8 @@ @echo off -:: 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.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 -SET PATH=%_%\..\..\applications\scons;%_%\..\..\applications\mingw\bin;c:\python25 - -:: Goto TRUNK and call SCons -cd \ -cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py --enable-debug fife-python - -:: Return us to the directory we started from -cd %_% +:: run scons +python ..\..\applications\scons\scons.py -C ..\..\..\..\ --enable-debug fife-python :: copy the needed dlls to the path where fife was installed call copy_dlls.bat +
--- a/build/win32/build_environments/scons/build_engine_nolog.bat Thu Jan 21 21:22:45 2010 +0000 +++ b/build/win32/build_environments/scons/build_engine_nolog.bat Fri Jan 22 19:03:43 2010 +0000 @@ -1,20 +1,8 @@ @echo off -:: 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.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 -SET PATH=%_%\..\..\applications\scons;%_%\..\..\applications\mingw\bin;c:\python25 - -:: Goto TRUNK and call SCons -cd \ -cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py --release --disable-log fife-python - -:: Return us to the directory we started from -cd %_% +:: run scons +python ..\..\applications\scons\scons.py -C ..\..\..\..\ --disable-log fife-python :: copy the needed dlls to the path where fife was installed call copy_dlls.bat +
--- a/build/win32/build_environments/scons/build_tests.bat Thu Jan 21 21:22:45 2010 +0000 +++ b/build/win32/build_environments/scons/build_tests.bat Fri Jan 22 19:03:43 2010 +0000 @@ -1,20 +1,8 @@ -:: 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.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 -SET PATH=%_%\..\..\applications\scons;%_%\..\..\applications\mingw\bin;c:\python25 +@echo off -:: Goto TRUNK and call SCons -cd \ -cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py tests +:: run scons +python ..\..\applications\scons\scons.py -C ..\..\..\..\ tests -:: Delete old versions of _fife.pyd and rename the compiled fife.dll to _fife.pyd -::cd "%_%\..\..\..\..\engine\swigwrappers\python" -::del _fife.pyd -::move "..\..\fife.dll" .\_fife.pyd +:: copy the needed dlls to the path where fife was installed +call copy_dlls.bat -:: Return us to the directory we started from -cd %_% \ No newline at end of file
--- a/build/win32/build_environments/scons/cleanup_engine.bat Thu Jan 21 21:22:45 2010 +0000 +++ b/build/win32/build_environments/scons/cleanup_engine.bat Fri Jan 22 19:03:43 2010 +0000 @@ -1,20 +1,20 @@ :: 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.40" +::SET _=%CD% +::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 -SET PATH=%_%\..\..\applications\scons;%_%\..\..\applications\mingw\bin;c:\python25 +::SET PATH=%_%\..\..\applications\scons;%_%\..\..\applications\mingw\bin;c:\python25 :: Goto TRUNK and call SCons -cd \ -cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py -c -python build\win32\applications\scons\scons.py -c fife-python fife-swig --release +::cd \ +::cd "%_%\..\..\..\.." +python ..\..\applications\scons\scons.py -C ..\..\..\..\ -c +python ..\..\applications\scons\scons.py -C ..\..\..\..\ -c fife-python fife-swig :: Delete _fife.pyd ::cd "%_%\..\..\..\..\engine\swigwrappers\python" ::del _fife.pyd :: Return us to the directory we started from -cd %_% +::cd %_%
--- a/build/win32/build_environments/scons/install_engine.bat Thu Jan 21 21:22:45 2010 +0000 +++ b/build/win32/build_environments/scons/install_engine.bat Fri Jan 22 19:03:43 2010 +0000 @@ -1,20 +1,7 @@ @echo off -:: 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.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 -SET PATH=%_%\..\..\applications\scons;%_%\..\..\applications\mingw\bin;c:\python26 - -:: Goto TRUNK and call SCons -cd \ -cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py install-python - -:: Return us to the directory we started from -cd %_% +:: run scons +python ..\..\applications\scons\scons.py -C ..\..\..\..\ install-python :: copy the needed dlls to the path where fife was installed call copy_dlls.bat install
--- a/build/win32/build_environments/scons/list_scons_args.bat Thu Jan 21 21:22:45 2010 +0000 +++ b/build/win32/build_environments/scons/list_scons_args.bat Fri Jan 22 19:03:43 2010 +0000 @@ -1,15 +1,4 @@ -:: 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.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 -SET PATH=%_%\..\..\applications\scons;%_%\..\..\applications\mingw\bin;c:\python25 +@echo off -:: Goto TRUNK and call SCons -cd \ -cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py -h > "%_%\scons_args.txt" 2>&1 - -:: Return us to the directory we started from -cd %_% +:: run scons +python ..\..\applications\scons\scons.py -C ..\..\..\..\ -h > scons_args.txt 2>&1
--- a/build/win32/build_environments/scons/logbuild_engine.bat Thu Jan 21 21:22:45 2010 +0000 +++ b/build/win32/build_environments/scons/logbuild_engine.bat Fri Jan 22 19:03:43 2010 +0000 @@ -1,23 +1,7 @@ @echo off -:: 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.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 -SET PATH=%_%\..\..\applications\scons;%_%\..\..\applications\mingw\bin;c:\python25 - -:: Delete engine_build_log.txt in case that it's still in place from a former compile sessions -del "%_%\engine_build_log.txt" - -:: Goto TRUNK and call SCons -cd \ -cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py fife-python >> "%_%\engine_build_log.txt" 2>&1 - -:: Return us to the directory we started from -cd %_% +:: run scons +python ..\..\applications\scons\scons.py -C ..\..\..\..\ fife-python > engine_build_log.txt 2>&1 :: copy the needed dlls to the path where fife was installed call copy_dlls.bat
--- a/build/win32/build_environments/scons/logbuild_engine_debug.bat Thu Jan 21 21:22:45 2010 +0000 +++ b/build/win32/build_environments/scons/logbuild_engine_debug.bat Fri Jan 22 19:03:43 2010 +0000 @@ -1,23 +1,7 @@ @echo off -:: 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.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 -SET PATH=%_%\..\..\applications\scons;%_%\..\..\applications\mingw\bin;c:\python25 - -:: Delete engine_build_log.txt in case that it's still in place from a former compile sessions -del "%_%\engine_build_log.txt" - -:: Goto TRUNK and call SCons -cd \ -cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py --enable-debug fife-python >> "%_%\engine_build_log.txt" 2>&1 - -:: Return us to the directory we started from -cd %_% +:: run scons +python ..\..\applications\scons\scons.py -C ..\..\..\..\ --enable-debug fife-python > engine_build_log.txt 2>&1 :: copy the needed dlls to the path where fife was installed call copy_dlls.bat
--- a/build/win32/build_environments/scons/logbuild_engine_nolog.bat Thu Jan 21 21:22:45 2010 +0000 +++ b/build/win32/build_environments/scons/logbuild_engine_nolog.bat Fri Jan 22 19:03:43 2010 +0000 @@ -1,23 +1,7 @@ @echo off -:: 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.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 -SET PATH=%_%\..\..\applications\scons;%_%\..\..\applications\mingw\bin;c:\python25 - -:: Delete engine_build_log.txt in case that it's still in place from a former compile sessions -del "%_%\engine_build_log.txt" - -:: Goto TRUNK and call SCons -cd \ -cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py --disable-log fife-python >> "%_%\engine_build_log.txt" 2>&1 - -:: Return us to the directory we started from -cd %_% +:: run scons +python ..\..\applications\scons\scons.py -C ..\..\..\..\ --disable-log fife-python > engine_build_log.txt 2>&1 :: copy the needed dlls to the path where fife was installed call copy_dlls.bat
--- a/build/win32/build_environments/scons/logbuild_tests.bat Thu Jan 21 21:22:45 2010 +0000 +++ b/build/win32/build_environments/scons/logbuild_tests.bat Fri Jan 22 19:03:43 2010 +0000 @@ -1,18 +1,7 @@ -:: 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.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 -SET PATH=%_%\..\..\applications\scons;%_%\..\..\applications\mingw\bin;c:\python25 +@echo off -:: Delete engine_build_log.txt in case that it's still in place from a former compile sessions -del "%_%\engine_build_log.txt" +:: run scons +python ..\..\applications\scons\scons.py -C ..\..\..\..\ tests > engine_build_log.txt 2>&1 -:: Goto TRUNK and call SCons -cd \ -cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py tests >> "%_%\engine_build_log.txt" 2>&1 - -:: Return us to the directory we started from -cd %_% +:: copy the needed dlls to the path where fife was installed +call copy_dlls.bat
--- a/build/win32/build_environments/scons/loginstall_engine.bat Thu Jan 21 21:22:45 2010 +0000 +++ b/build/win32/build_environments/scons/loginstall_engine.bat Fri Jan 22 19:03:43 2010 +0000 @@ -1,20 +1,7 @@ @echo off -:: 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.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 -SET PATH=%_%\..\..\applications\scons;%_%\..\..\applications\mingw\bin;c:\python26 - -:: Goto TRUNK and call SCons -cd \ -cd "%_%\..\..\..\.." -python build\win32\applications\scons\scons.py install-python > "%_%\engine_install_log.txt" 2>&1 - -:: Return us to the directory we started from -cd %_% +:: run scons +python ..\..\applications\scons\scons.py -C ..\..\..\..\ install-python > engine_build_log.txt 2>&1 :: copy the needed dlls to the path where fife was installed call copy_dlls.bat install \ No newline at end of file
--- a/tests/core_tests/fife_unittest.h Thu Jan 21 21:22:45 2010 +0000 +++ b/tests/core_tests/fife_unittest.h Fri Jan 22 19:03:43 2010 +0000 @@ -27,14 +27,14 @@ // Platform specific includes // Linux #if defined( __unix__ ) -#include "../../ext/UnitTest++/src/UnitTest++.h" -#include "../../ext/UnitTest++/src/TestReporterStdout.h" +#include <unittest++/UnitTest++.h> +#include <unittest++/TestReporterStdout.h> #endif // Win32 #if defined( WIN32 ) -#include "../../ext/UnitTest++/src/UnitTest++.h" -#include "../../ext/UnitTest++/src/TestReporterStdout.h" +#include <UnitTest++.h> +#include <TestReporterStdout.h> #endif // Macintosh