aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2011-03-08 18:14:33 +0100
committerJohannes Schickel2011-03-08 18:16:36 +0100
commitfe89ffe80a1f2eacc9ac48f4b5961e44a07c5b81 (patch)
tree7df8c1876ae237594260ed8ea17846204b8f4216
parentfc074fef48cff8a6c8cfc93b8f31353233830de5 (diff)
downloadscummvm-rg350-fe89ffe80a1f2eacc9ac48f4b5961e44a07c5b81.tar.gz
scummvm-rg350-fe89ffe80a1f2eacc9ac48f4b5961e44a07c5b81.tar.bz2
scummvm-rg350-fe89ffe80a1f2eacc9ac48f4b5961e44a07c5b81.zip
WINCE: Add -fno-inline-functions to compiler arguments.
WinCE is using -O3 by default, which includes -finline-functions, which in turn breaks SCI. By disabling that opimization we get SCI working fine again.
-rw-r--r--backends/platform/wince/Makefile2
-rwxr-xr-xconfigure2
2 files changed, 2 insertions, 2 deletions
diff --git a/backends/platform/wince/Makefile b/backends/platform/wince/Makefile
index 8ad134648b..21bff06f95 100644
--- a/backends/platform/wince/Makefile
+++ b/backends/platform/wince/Makefile
@@ -113,7 +113,7 @@ INCLUDES := -I$(srcdir) -I. -I$(srcdir)/engines -Imissing/gcc -Ilibs/include -Il
CFLAGS :=
ifndef UNOPTIMIZED_BUILD
-CFLAGS += -O3 -march=armv4 -mtune=xscale
+CFLAGS += -O3 -fno-inline-functions -march=armv4 -mtune=xscale
endif
LDFLAGS := -Wl,-Map,scummvm.exe.map -Wl,--stack,65536
diff --git a/configure b/configure
index fb453d1afa..99edbe2716 100755
--- a/configure
+++ b/configure
@@ -1653,7 +1653,7 @@ case $_host_os in
fi
;;
wince)
- CXXFLAGS="$CXXFLAGS -O3 -march=armv4 -mtune=xscale"
+ CXXFLAGS="$CXXFLAGS -O3 -fno-inline-functions --march=armv4 -mtune=xscale"
DEFINES="$DEFINES -D_WIN32_WCE=300 -D__ARM__ -D_ARM_ -DUNICODE -DFPM_DEFAULT -DNONSTANDARD_PORT"
DEFINES="$DEFINES -DWIN32 -Dcdecl= -D__cdecl__="
;;