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

[dhewg at users.sourceforge.net]

Revision: 52073
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52073&view=rev
Author:   dhewg
Date:     2010-08-14 00:51:44 +0000 (Sat, 14 Aug 2010)

Log Message:
-----------
BUILDBOT: Prepare Wii port for the latest upstream changes, disable branch build due to incompatibility.

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

Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg	2010-08-14 00:25:10 UTC (rev 52072)
+++ buildbot/config/master.cfg	2010-08-14 00:51:44 UTC (rev 52073)
@@ -151,8 +151,8 @@
 scumm_env_wii = copy.deepcopy(scumm_env)
 scumm_env_wii["PATH"] = "%s/devkitPPC/bin:%s" % (scumm_root_wii, os.environ["PATH"])
 scumm_env_wii["CXX"] = "ccache powerpc-gekko-g++"
-scumm_env_wii["CXXFLAGS"] = "-isystem %s/3rd/wii/include" % scumm_root_wii
-scumm_env_wii["LDFLAGS"] = "-L%s/3rd/wii/lib" % scumm_root_wii
+scumm_env_wii["CXXFLAGS"] = "-isystem %s/3rd/include" % scumm_root_wii
+scumm_env_wii["LDFLAGS"] = "-L%s/3rd/lib" % scumm_root_wii
 scumm_env_wii["DEVKITPRO"] = "%s" % scumm_root_wii
 scumm_env_wii["DEVKITPPC"] = "%s/devkitPPC" % scumm_root_wii
 
@@ -167,7 +167,6 @@
 }
 
 scumm_platforms_trunk["wii"] = p
-scumm_platforms_branch["wii"] = p
 
 # Nintendo DS
 scumm_root_ds = "/opt/toolchains/devkitARM-r30"


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