thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AmigaOS4: Adapt configure to latest SDK (Patch created by Raziel^)

Browse source
This commit is contained in:
strangerke 2011-04-30 22:00:17 +02:00
parent 96965b4896
commit 54ddd000dc
2 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile.common
View file

@ -154,8 +154,7 @@ endif
# Get the current version information # Get the current version information
###################################################################### ######################################################################
# AmigaOS4's grep has a problem with "./" in pathnames, so use cat. VERSION = $(shell grep SCUMMVM_VERSION "${srcdir}/base/internal_version.h" | cut -d\" -f2)
VERSION = $(shell cat "${srcdir}/base/internal_version.h" | grep SCUMMVM_VERSION | cut -d\" -f2)
VER_MAJOR = $(shell echo $(VERSION) | cut -d. -f 1) VER_MAJOR = $(shell echo $(VERSION) | cut -d. -f 1)
VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2) VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1) VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1)

11
configure vendored
View file

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