[Scummvm-cvs-logs] SF.net SVN: scummvm:[42052] buildbot/config/master.cfg

[fingolfin at users.sourceforge.net]

Revision: 42052
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42052&view=rev
Author:   fingolfin
Date:     2009-07-03 09:47:47 +0000 (Fri, 03 Jul 2009)

Log Message:
-----------
Fixes for lenny-64 and mingw-32 builds

Modified Paths:
--------------
    buildbot/config/master.cfg

Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg	2009-07-03 09:33:58 UTC (rev 42051)
+++ buildbot/config/master.cfg	2009-07-03 09:47:47 UTC (rev 42052)
@@ -77,9 +77,9 @@
 scumm_root_lenny_x86_64 = "/opt/toolchains/debian-lenny-x86_64"
 scumm_env_lenny_x86_64 = copy.deepcopy(scumm_env)
 scumm_env_lenny_x86_64["CXX"] = "ccache g++"
-scumm_env_lenny_x86_64["CXXFLAGS"] = "-m64 -isystem %s/include" % scumm_root_lenny_x86_64;
-scumm_env_lenny_x86_64["LDFLAGS"] = "-m64 -Wl,-rpath,%s/lib -Wl,-rpath,%s/usr/lib" % \
-									(scumm_root_lenny_x86_64, scumm_root_lenny_x86_64)
+scumm_env_lenny_x86_64["CXXFLAGS"] = "-m64 -isystem %s/usr/include" % scumm_root_lenny_x86_64;
+scumm_env_lenny_x86_64["LDFLAGS"] = "-m64 -Wl,-rpath,%s/lib -Wl,-rpath,%s/usr/lib -L%s/usr/lib" % \
+									(scumm_root_lenny_x86_64, scumm_root_lenny_x86_64, scumm_root_lenny_x86_64)
 
 p = {
 	"configureargs": [
@@ -95,6 +95,7 @@
 # mingw 32bit, using the mingw compiler from the debian repositories.
 scumm_root_mingw_w32 = "/opt/toolchains/i586-mingw32msvc"
 scumm_env_mingw_w32 = copy.deepcopy(scumm_env)
+scumm_env_mingw_w32["PATH"] = "%s/bin:%s" % (scumm_root_mingw_w32, os.environ["PATH"])
 scumm_env_mingw_w32["CXX"] = "ccache i586-mingw32msvc-g++"
 scumm_env_mingw_w32["CXXFLAGS"] = "-isystem %s/include" % scumm_root_mingw_w32;
 scumm_env_mingw_w32["LDFLAGS"] = "-L%s/lib" % scumm_root_mingw_w32;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.