Mercurial > fife-parpg

changeset 388:605d13efc6f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More fixes for the win32 batch files to remove the need to overwrite the users path and define variables. [t:429]
author vtchill@33b003aa-7bff-0310-803a-e67f0ece8222
date Sat, 23 Jan 2010 00:18:54 +0000
parents 847c6ec4544e
children a3a044c586ab
files build/win32/update_project_files.bat build/win32/update_swig_files.bat
diffstat 2 files changed, 6 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/build/win32/update_project_files.bat	Fri Jan 22 19:03:43 2010 +0000
+++ b/build/win32/update_project_files.bat	Sat Jan 23 00:18:54 2010 +0000
@@ -1,10 +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:\python26
+@echo off
 
 :: Delete old generated project files to ensure that they get generated from scratch again
 cd %_%\build_environments
@@ -12,10 +6,6 @@
 del visual_studio_8\fife.vcproj
 del visual_studio_9\fife.vcproj
 
-:: Goto TRUNK and call SCons
-cd \
-cd "%_%\..\..\"
-python build\win32\applications\scons\scons.py projects
+:: run scons
+python applications\scons\scons.py -C ..\..\ projects
 
-:: Return us to the directory we started from
-cd %_%
--- a/build/win32/update_swig_files.bat	Fri Jan 22 19:03:43 2010 +0000
+++ b/build/win32/update_swig_files.bat	Sat Jan 23 00:18:54 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:\python26
+@echo off
 
-:: Goto TRUNK and call SCons
-cd \
-cd "%_%\..\..\"
-python build\win32\applications\scons\scons.py fife-swig
-
-:: Return us to the directory we started from
-cd %_%
+:: run scons
+python applications\scons\scons.py -C ..\..\ fife-swig