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

dhewg at users.sourceforge.net dhewg at users.sourceforge.net
Mon Jan 23 18:43:50 CET 2012


Revision: 56236
          http://scummvm.svn.sourceforge.net/scummvm/?rev=56236&view=rev
Author:   dhewg
Date:     2012-01-23 17:43:48 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
BUILDBOT: Update the mingw-w64 toolchain

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

Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg	2012-01-23 09:14:18 UTC (rev 56235)
+++ buildbot/config/master.cfg	2012-01-23 17:43:48 UTC (rev 56236)
@@ -131,23 +131,22 @@
 scumm_platforms_stable["mingw-w32"] = p
 
 # mingw 64bit, using an experimental snapshot of mingw-w64.
-scumm_root_mingw_w64 = "/opt/toolchains/mingw-w64-bin_i686-linux"
+scumm_root_mingw_w64 = "/opt/toolchains/x86_64-w64-mingw32"
 scumm_env_mingw_w64 = copy.deepcopy(scumm_env)
-scumm_env_mingw_w64["PATH"] = "%s/bin:%s" % (scumm_root_mingw_w64, DEFAULT_PATH)
-scumm_env_mingw_w64["CXX"] = "ccache x86_64-pc-mingw32-g++"
-scumm_env_mingw_w64["CXXFLAGS"] = "-isystem %s/include" % scumm_root_mingw_w64
-scumm_env_mingw_w64["LDFLAGS"] = "-L%s/lib" % scumm_root_mingw_w64
+scumm_env_mingw_w64["PATH"] = "%s/bin:%s/usr/bin:%s" % (scumm_root_mingw_w64, scumm_root_mingw_w64, DEFAULT_PATH)
+scumm_env_mingw_w64["CXX"] = "ccache x86_64-w64-mingw32-g++"
+scumm_env_mingw_w64["CXXFLAGS"] = "-isystem %s/usr/include" % scumm_root_mingw_w64
+scumm_env_mingw_w64["LDFLAGS"] = "-L%s/usr/lib" % scumm_root_mingw_w64
 
 p = {
 	"configureargs": [
-		"--host=x86_64-pc-mingw32",
+		"--host=x86_64-w64-mingw32"
 	],
 	"env": scumm_env_mingw_w64,
-	"strip": "%s/bin/x86_64-pc-mingw32-strip scummvm.exe" % scumm_root_mingw_w64,
+	"strip": "%s/bin/x86_64-w64-mingw32-strip scummvm.exe" % scumm_root_mingw_w64,
 	"package": [
 		"scummvm.exe",
-		"%s/bin/SDL.dll" % scumm_root_mingw_w64,
-		"%s/bin/libgcc_s_sjlj-1.dll" % scumm_root_mingw_w64
+		"%s/usr/bin/SDL.dll" % scumm_root_mingw_w64
 	]
 }
 

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





More information about the Scummvm-git-logs mailing list