From 2fd2247ab8045f2e565c2b54e18edcb758834160 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 29 Apr 2011 12:51:33 +0200
Subject: WEBOS: Tweak configure script to simplify support for WebOS on
 buildbot

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 399fd4265c..2965d0911a 100755
--- a/configure
+++ b/configure
@@ -1672,6 +1672,7 @@ case $_host_os in
 		_unix=yes
 		;;
 	webos)
+		CXXFLAGS="$CXXFLAGS -I$WEBOS_PDK/include -I$WEBOS_PDK/include/SDL -I$WEBOS_PDK/device/usr/include"
 		LDFLAGS="$LDFLAGS -L$WEBOS_PDK/device/lib -L$WEBOS_PDK/device/usr/lib"
 		LDFLAGS="$LDFLAGS -Wl,--allow-shlib-undefined"
 		LDFLAGS="$LDFLAGS --sysroot=$WEBOS_PDK/arm-gcc/sysroot"
@@ -3109,7 +3110,6 @@ case $_backend in
 		DEFINES="$DEFINES -DSDL_BACKEND"
 		;;
 	webos)
-		INCLUDES="$INCLUDES -I$WEBOS_PDK/include -I$WEBOS_PDK/include/SDL -I$WEBOS_PDK/device/usr/include"
 		LIBS="$LIBS -lSDL -lpdl"
 		DEFINES="$DEFINES -DSDL_BACKEND -DWEBOS"
 		MODULES="$MODULES backends/platform/sdl"
-- 
cgit v1.2.3


From 54ddd000dcbe43f4b58d30b6b7e98775233bff01 Mon Sep 17 00:00:00 2001
From: strangerke
Date: Sat, 30 Apr 2011 22:00:17 +0200
Subject: AmigaOS4: Adapt configure to latest SDK (Patch created by Raziel^)

---
 configure | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 2965d0911a..d0a04643ef 100755
--- a/configure
+++ b/configure
@@ -252,12 +252,7 @@ EOF
 }
 
 gcc_get_define() {
-	# Note: The AmigaOS compiler doesn't like the "-" input file, so a real file
-	# is used instead
-	rm -f $TMPC
-	touch $TMPC
-	$CXX -dM -E $TMPC | fgrep "$1" | head -n1 | cut -d ' ' -f 3-
-	rm -f $TMPC
+	echo "" | $CXX -dM -E - | fgrep "$1" | head -n1 | cut -d ' ' -f 3-
 }
 
 #
@@ -1519,8 +1514,7 @@ echo_n "Checking hosttype... "
 echo $_host_os
 case $_host_os in
 	amigaos*)
-		CXXFLAGS="$CXXFLAGS -mcrt=newlib -mstrict-align -mcpu=750 -mtune=7400"
-		LDFLAGS="$LDFLAGS -mcrt=newlib -use-dynld -L/sdk/local/newlib/lib"
+		LDFLAGS="$LDFLAGS -use-dynld -L/sdk/local/newlib/lib"
 		# We have to use 'long' for our 4 byte typedef because AmigaOS already typedefs (u)int32
 		# as (unsigned) long, and consequently we'd get a compiler error otherwise.
 		type_4_byte='long'
@@ -1970,6 +1964,7 @@ if test -n "$_host"; then
 			;;
 		ppc-amigaos)
 			_endian=big
++			# AmigaOS exec allocates memory always in an aligned way
 			_need_memalign=yes
 			;;
 		ps2)
-- 
cgit v1.2.3


From 69dcca74da1364706fe0b0d3495c12f9fc2c720a Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 1 May 2011 03:23:39 +0200
Subject: CONFIGURE: Remove incorrect "+" added with 54ddd000dc.

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index d0a04643ef..7a15c7acd8 100755
--- a/configure
+++ b/configure
@@ -1964,7 +1964,7 @@ if test -n "$_host"; then
 			;;
 		ppc-amigaos)
 			_endian=big
-+			# AmigaOS exec allocates memory always in an aligned way
+			# AmigaOS exec allocates memory always in an aligned way
 			_need_memalign=yes
 			;;
 		ps2)
-- 
cgit v1.2.3


From 831f974cb42c5993ec66d785858e5bd962f2b864 Mon Sep 17 00:00:00 2001
From: Klaus Reimer
Date: Sun, 1 May 2011 11:12:51 +0200
Subject: WEBOS: Added compiler options that should enable support for the Palm
 Pixi. Can't test it because I have no Pixi but at least it still works on the
 Pre.

---
 configure | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure')

diff --git a/configure b/configure
index 7a15c7acd8..6077d86b42 100755
--- a/configure
+++ b/configure
@@ -1667,6 +1667,7 @@ case $_host_os in
 		;;
 	webos)
 		CXXFLAGS="$CXXFLAGS -I$WEBOS_PDK/include -I$WEBOS_PDK/include/SDL -I$WEBOS_PDK/device/usr/include"
+		CXXFLAGS="$CXXFLAGS -mcpu=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
 		LDFLAGS="$LDFLAGS -L$WEBOS_PDK/device/lib -L$WEBOS_PDK/device/usr/lib"
 		LDFLAGS="$LDFLAGS -Wl,--allow-shlib-undefined"
 		LDFLAGS="$LDFLAGS --sysroot=$WEBOS_PDK/arm-gcc/sysroot"
-- 
cgit v1.2.3


From 1d1ee5c9793b96858d53c006c8448ffe288b100f Mon Sep 17 00:00:00 2001
From: Klaus Reimer
Date: Sun, 1 May 2011 23:41:34 +0200
Subject: WEBOS: Added a default prefix and enforcing docdir, datadir and
 plugin directory.

---
 configure | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 6077d86b42..e4167f3401 100755
--- a/configure
+++ b/configure
@@ -1138,6 +1138,10 @@ webos)
 	_host_os=webos
 	_host_cpu=arm
 	_host_alias=arm-none-linux-gnueabi
+	test "x$prefix" = xNONE && prefix=/media/cryptofs/apps/usr/palm/applications/org.scummvm.scummvm
+	datarootdir='${prefix}/data'
+	datadir='${datarootdir}'
+	docdir='${prefix}/doc'
 	;;
 wii)
 	_host_os=wii
@@ -2928,6 +2932,9 @@ case $_backend in
 		# Add ../plugins as a path so plugins can be found when running from a .PND.
 		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"../plugins\\\""
 		;;
+	webos)
+		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$libdir\\\""
+		;;
 	*)
 		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$libdir/scummvm\\\""
 		;;
-- 
cgit v1.2.3