[Scummvm-cvs-logs] scummvm master -> fe89ffe80a1f2eacc9ac48f4b5961e44a07c5b81

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fe89ffe80a WINCE: Add -fno-inline-functions to compiler arguments.


Commit: fe89ffe80a1f2eacc9ac48f4b5961e44a07c5b81
    https://github.com/scummvm/scummvm/commit/fe89ffe80a1f2eacc9ac48f4b5961e44a07c5b81
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-03-08T09:16:36-08:00

Commit Message:
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.

Changed paths:
    backends/platform/wince/Makefile
    configure



diff --git a/backends/platform/wince/Makefile b/backends/platform/wince/Makefile
index 8ad1346..21bff06 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 fb453d1..99edbe2 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__="
 		;;