[Scummvm-cvs-logs] SF.net SVN: scummvm:[42042] buildbot/config/master.cfg
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Jul 3 00:34:59 CEST 2009
Revision: 42042
http://scummvm.svn.sourceforge.net/scummvm/?rev=42042&view=rev
Author: fingolfin
Date: 2009-07-02 22:34:59 +0000 (Thu, 02 Jul 2009)
Log Message:
-----------
Switched buildbot config to use -isystem + -L instead of passing --with-mad-prefix=FOO etc. to configure -> avoids warnings about things in library headers; and makes it a tad easier to plugin new 3rd party libraries into a toolchain
Modified Paths:
--------------
buildbot/config/master.cfg
Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg 2009-07-02 22:21:33 UTC (rev 42041)
+++ buildbot/config/master.cfg 2009-07-02 22:34:59 UTC (rev 42042)
@@ -77,17 +77,13 @@
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"
+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)
p = {
"configureargs": [
"--host=x86_64-unknown-linux-gnu",
- "--with-sdl-prefix=%s/usr" % scumm_root_lenny_x86_64,
- "--with-mad-prefix=%s/usr" % scumm_root_lenny_x86_64,
- "--with-ogg-prefix=%s/usr" % scumm_root_lenny_x86_64,
- "--with-fluidsynth-prefix=%s/usr" % scumm_root_lenny_x86_64
],
"env": scumm_env_lenny_x86_64,
"package": [ "scummvm" ]
@@ -100,15 +96,12 @@
scumm_root_mingw_w32 = "/opt/toolchains/i586-mingw32msvc"
scumm_env_mingw_w32 = copy.deepcopy(scumm_env)
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;
p = {
"configureargs": [
"--host=i586-mingw32msvc",
- "--with-sdl-prefix=%s" % scumm_root_mingw_w32,
- "--with-mad-prefix=%s" % scumm_root_mingw_w32,
- "--with-ogg-prefix=%s" % scumm_root_mingw_w32,
- "--with-flac-prefix=%s" % scumm_root_mingw_w32,
- "--with-zlib-prefix=%s" % scumm_root_mingw_w32
],
"env": scumm_env_mingw_w32,
"package": [
@@ -125,15 +118,12 @@
scumm_env_mingw_w64 = copy.deepcopy(scumm_env)
scumm_env_mingw_w64["PATH"] = "%s/bin:%s" % (scumm_root_mingw_w64, os.environ["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;
p = {
"configureargs": [
"--host=x86_64-pc-mingw32",
- "--with-sdl-prefix=%s" % scumm_root_mingw_w64,
- "--with-mad-prefix=%s" % scumm_root_mingw_w64,
- "--with-ogg-prefix=%s" % scumm_root_mingw_w64,
- "--with-flac-prefix=%s" % scumm_root_mingw_w64,
- "--with-zlib-prefix=%s" % scumm_root_mingw_w64
],
"env": scumm_env_mingw_w64,
"package": [
@@ -150,6 +140,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["DEVKITPRO"] = "%s" % scumm_root_wii
scumm_env_wii["DEVKITPPC"] = "%s/devkitPPC" % scumm_root_wii
@@ -157,8 +149,6 @@
"configureargs": [
"--host=wii",
"--enable-vkeybd",
- "--with-tremor-prefix=%s/3rd/wii" % scumm_root_wii,
- "--with-flac-prefix=%s/3rd/wii" % scumm_root_wii
],
"env": scumm_env_wii,
"disttarget": "wiidist",
@@ -172,16 +162,13 @@
scumm_env_osx_intel = copy.deepcopy(scumm_env)
scumm_env_osx_intel["PATH"] = "%s/bin:%s" % (scumm_root_osx_intel, os.environ["PATH"])
scumm_env_osx_intel["CXX"] = "ccache i686-apple-darwin9-g++"
+scumm_env_osx_intel["CXXFLAGS"] = "-isystem %s/include" % scumm_root_osx_intel;
+scumm_env_osx_intel["LDFLAGS"] = "-L%s/lib" % scumm_root_osx_intel;
p = {
"configureargs": [
"--host=i686-apple-darwin9",
"--disable-nasm",
- "--with-sdl-prefix=%s" % scumm_root_osx_intel,
- "--with-mad-prefix=%s" % scumm_root_osx_intel,
- "--with-ogg-prefix=%s" % scumm_root_osx_intel,
- "--with-flac-prefix=%s" % scumm_root_osx_intel,
- "--with-zlib-prefix=%s" % scumm_root_osx_intel,
"--with-staticlib-prefix=%s" % scumm_root_osx_intel,
],
"env": scumm_env_osx_intel,
@@ -196,19 +183,13 @@
scumm_env_osx_ppc = copy.deepcopy(scumm_env)
scumm_env_osx_ppc["PATH"] = "%s/bin:%s" % (scumm_root_osx_ppc, os.environ["PATH"])
scumm_env_osx_ppc["CXX"] = "ccache ppc-apple-darwin8-g++"
-scumm_env_osx_ppc["CXXFLAGS"] = "-fabi-version=1 -fno-use-cxa-atexit"
-scumm_env_osx_ppc["LDFLAGS"] = "-static-libgcc -ldl"
+scumm_env_osx_ppc["CXXFLAGS"] = "-fabi-version=1 -fno-use-cxa-atexit -isystem %s/include" % scumm_root_osx_ppc;
+scumm_env_osx_ppc["LDFLAGS"] = "-L%s/lib -static-libgcc -ldl" % scumm_root_osx_ppc;
scumm_env_osx_ppc["MACOSX_DEPLOYMENT_TARGET"] = "10.2"
p = {
"configureargs": [
"--host=ppc-apple-darwin8",
- "--with-sdl-prefix=%s" % scumm_root_osx_ppc,
- "--with-mad-prefix=%s" % scumm_root_osx_ppc,
- "--with-ogg-prefix=%s" % scumm_root_osx_ppc,
- "--with-vorbis-prefix=%s" % scumm_root_osx_ppc,
- "--with-flac-prefix=%s" % scumm_root_osx_ppc,
- "--with-zlib-prefix=%s" % scumm_root_osx_ppc,
"--with-staticlib-prefix=%s" % scumm_root_osx_ppc,
],
"env": scumm_env_osx_ppc,
@@ -224,18 +205,15 @@
scumm_env_iphone = copy.deepcopy(scumm_env)
scumm_env_iphone["PATH"] = "%s/bin:%s" % (scumm_root_iphone, os.environ["PATH"])
scumm_env_iphone["CXX"] = "ccache arm-apple-darwin9-g++"
+scumm_env_iphone["CXXFLAGS"] = "-isystem %s/include" % scumm_libdir_iphone;
scumm_env_iphone["AS"] = "%s/bin/arm-apple-darwin9-as" % scumm_root_iphone
-scumm_env_iphone["LDFLAGS"] = "-F%s/SDK/System/Library/PrivateFrameworks -bind_at_load" % scumm_root_iphone
+scumm_env_iphone["LDFLAGS"] = "-F%s/SDK/System/Library/PrivateFrameworks -bind_at_load -L%s/lib" % (scumm_root_iphone, scumm_libdir_iphone)
scumm_env_iphone["LIBDIR"] = scumm_libdir_iphone
p = {
"configureargs": [
"--host=iphone",
- "--with-mad-prefix=%s" % scumm_libdir_iphone,
- "--with-ogg-prefix=%s" % scumm_libdir_iphone,
- "--with-flac-prefix=%s" % scumm_libdir_iphone,
- "--with-zlib-prefix=%s" % scumm_libdir_iphone,
- "--with-staticlib-prefix=%s" % scumm_libdir_iphone
+ "--with-staticlib-prefix=%s" % scumm_libdir_iphone,
],
"env": scumm_env_iphone,
"disttarget": "iphonebundle",
@@ -249,6 +227,8 @@
scumm_env_psp = copy.deepcopy(scumm_env)
scumm_env_psp["PATH"] = "%s/bin:%s" % (scumm_root_psp, os.environ["PATH"])
scumm_env_psp["CXX"] = "ccache psp-g++"
+scumm_env_psp["CXXFLAGS"] = "-isystem %s/include" % scumm_root_psp;
+scumm_env_psp["LDFLAGS"] = "-L%s/lib" % scumm_root_psp;
scumm_env_psp["PSPDEV"] = scumm_root_psp
p = {
@@ -267,15 +247,14 @@
scumm_env_gp2x = copy.deepcopy(scumm_env)
scumm_env_gp2x["PATH"] = "%s/bin:%s" % (scumm_root_gp2x, os.environ["PATH"])
scumm_env_gp2x["CXX"] = "ccache arm-open2x-linux-g++"
+scumm_env_gp2x["CXXFLAGS"] = "-isystem %s/include" % scumm_root_gp2x;
+scumm_env_gp2x["LDFLAGS"] = "-L%s/lib" % scumm_root_gp2x;
scumm_env_gp2x["AS"] = "arm-open2x-linux-as"
scumm_env_gp2x["ASFLAGS"] = "-mfloat-abi=soft"
p = {
"configureargs": [
"--host=gp2x",
- "--with-mad-prefix=%s" % scumm_root_gp2x,
- "--with-tremor-prefix=%s" % scumm_root_gp2x,
- "--with-zlib-prefix=%s" % scumm_root_gp2x,
],
"env": scumm_env_gp2x,
"strip": "%s/bin/arm-open2x-linux-strip scummvm.gp2x" % scumm_root_gp2x,
@@ -289,6 +268,8 @@
scumm_env_dc = copy.deepcopy(scumm_env)
scumm_env_dc["PATH"] = "%s/bin:%s" % (scumm_root_dc, os.environ["PATH"])
scumm_env_dc["CXX"] = "ccache sh-elf-g++"
+scumm_env_dc["CXXFLAGS"] = "-isystem %s/include" % scumm_root_dc;
+scumm_env_dc["LDFLAGS"] = "-L%s/lib" % scumm_root_dc;
p = {
"configureargs": [
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