aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstrangerke2011-04-30 22:00:17 +0200
committerstrangerke2011-04-30 22:01:06 +0200
commit54ddd000dcbe43f4b58d30b6b7e98775233bff01 (patch)
treed51da95e90fd503f27aa289e00025223626768c3
parent96965b4896a15aca8a26f2b517b8a634738aa0de (diff)
downloadscummvm-rg350-54ddd000dcbe43f4b58d30b6b7e98775233bff01.tar.gz
scummvm-rg350-54ddd000dcbe43f4b58d30b6b7e98775233bff01.tar.bz2
scummvm-rg350-54ddd000dcbe43f4b58d30b6b7e98775233bff01.zip
AmigaOS4: Adapt configure to latest SDK (Patch created by Raziel^)
-rw-r--r--Makefile.common3
-rwxr-xr-xconfigure11
2 files changed, 4 insertions, 10 deletions
diff --git a/Makefile.common b/Makefile.common
index 6646af8e8d..e96774fe4e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -154,8 +154,7 @@ endif
# Get the current version information
######################################################################
-# AmigaOS4's grep has a problem with "./" in pathnames, so use cat.
-VERSION = $(shell cat "${srcdir}/base/internal_version.h" | grep SCUMMVM_VERSION | cut -d\" -f2)
+VERSION = $(shell grep SCUMMVM_VERSION "${srcdir}/base/internal_version.h" | cut -d\" -f2)
VER_MAJOR = $(shell echo $(VERSION) | cut -d. -f 1)
VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1)
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)