aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2010-08-02 17:12:03 +0000
committerMax Horn2010-08-02 17:12:03 +0000
commit8a3a41bc2b14c9eedeafc588de42e05860809045 (patch)
treea112baa81a1a80911c7f97ed7f698fc16b963e20
parent2682721aac813939f61105c40584373e3a30053c (diff)
downloadscummvm-rg350-8a3a41bc2b14c9eedeafc588de42e05860809045.tar.gz
scummvm-rg350-8a3a41bc2b14c9eedeafc588de42e05860809045.tar.bz2
scummvm-rg350-8a3a41bc2b14c9eedeafc588de42e05860809045.zip
DS: More closely immitate CXXFLAGS of custom DS build system
svn-id: r51637
-rw-r--r--backends/platform/ds/arm9/makefile1
-rwxr-xr-xconfigure3
2 files changed, 2 insertions, 2 deletions
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index 0446f84dad..eedf75c256 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -205,7 +205,6 @@ CXX = arm-eabi-g++
LD = arm-eabi-g++
CFLAGS = -Wno-multichar -Wall\
- -Wno-multichar -mcpu=arm9tdmi -mtune=arm9tdmi \
-mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer\
-mthumb-interwork -DUSE_ARM_COSTUME_ASM=1 -DDISABLE_SID
diff --git a/configure b/configure
index 165d7479b6..81c8970922 100755
--- a/configure
+++ b/configure
@@ -1390,7 +1390,8 @@ case $_host_os in
# TODO Nintendo DS
DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT"
CXXFLAGS="$CXXFLAGS -isystem $DEVKITPRO/libnds/include -isystem $DEVKITPRO/devkitARM/arm-eabi/include"
- CXXFLAGS="$CXXFLAGS -mthumb-interwork -ffunction-sections -fdata-sections -fno-strict-aliasing"
+ CXXFLAGS="$CXXFLAGS -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -mthumb-interwork"
+ CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections -fno-strict-aliasing"
LDFLAGS="$LDFLAGS -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt -Wl,--gc-sections"
LDFLAGS="$LDFLAGS -L$DEVKITPRO/libnds/lib"
LIBS="$LIBS -lnds9"