Author: loonycyborg
Date: Sat May 31 14:07:06 2008
New Revision: 26945
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26945&view=rev
Log:
SCons recipe:
- Forward PATH environment variable on windows.
- Empty CPPPATH for windres.
Modified:
trunk/SConstruct
trunk/packaging/windows/SConscript
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=26945&r1=26944&r2=26945&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Sat May 31 14:07:06 2008
@@ -79,6 +79,7 @@
env = Environment(tools=["tar", "gettext", "install"], options = opts,
toolpath = ["scons"])
if env["PLATFORM"] == "win32":
env.Tool("mingw")
+ env['ENV']['PATH'] = os.environ["PATH"]
else:
env.Tool("default")
Modified: trunk/packaging/windows/SConscript
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/packaging/windows/SConscript?rev=26945&r1=26944&r2=26945&view=diff
==============================================================================
--- trunk/packaging/windows/SConscript (original)
+++ trunk/packaging/windows/SConscript Sat May 31 14:07:06 2008
@@ -7,7 +7,7 @@
for bin in binaries:
#icon = env.Command(bin + "-icon.ico", join("../../icons", bin +
"-icon.png"), "$IM_CONVERT $SOURCE $TARGET")
try:
- res = [env.RES(bin + ".rc")]
+ res = [env.RES(bin + ".rc", CPPPATH=[])]
#env.Depends(res, icon)
except AttributeError:
res = []
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
