diff options
| author | Robin Watts | 2007-07-10 20:20:50 +0000 |
|---|---|---|
| committer | Robin Watts | 2007-07-10 20:20:50 +0000 |
| commit | b1feb9c65c715862d70b25cfa4e37df3a912cac5 (patch) | |
| tree | 35044ef853787c2de285f8fc0fce8a05b4ef80fa /backends/platform | |
| parent | 6e77abc07f20736fe7d50d3f3f3211839c630b53 (diff) | |
| download | scummvm-rg350-b1feb9c65c715862d70b25cfa4e37df3a912cac5.tar.gz scummvm-rg350-b1feb9c65c715862d70b25cfa4e37df3a912cac5.tar.bz2 scummvm-rg350-b1feb9c65c715862d70b25cfa4e37df3a912cac5.zip | |
This commit adds a new build define USE_ARM_GFX_ASM (and sets it for the WinCE
and DS builds). This causes the scumm engines graphics code to call ARM
routines to do drawStripToScreen and copy8col.
These routines were originally written for the DS port, and have now been made
available to any other ARM device out there that wants them.
I've tested this change on WinCE, but can't test it on the DS as I don't have
one. We know that the routines work there though.
svn-id: r28016
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/ds/arm9/makefile | 3 | ||||
| -rw-r--r-- | backends/platform/wince/Makefile | 18 |
2 files changed, 14 insertions, 7 deletions
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile index c9ca5467f3..7c93cc8b05 100644 --- a/backends/platform/ds/arm9/makefile +++ b/backends/platform/ds/arm9/makefile @@ -41,7 +41,7 @@ VPATH = $(srcdir) ARM = 1 ifdef DS_BUILD_A - DEFINES = -DDS_SCUMM_BUILD -DDS_BUILD_A + DEFINES = -DDS_SCUMM_BUILD -DDS_BUILD_A -DUSE_ARM_GFX_ASM LOGO = logoa.bmp DISABLE_HE = 1 #DISABLE_SCUMM = 1 @@ -60,6 +60,7 @@ ifdef DS_BUILD_A DISABLE_TOUCHE = 1 DISABLE_PARALLACTION = 1 DISABLE_CRUISE = 1 + USE_ARM_GFX_ASM = 1 BUILD=scummvm-A endif diff --git a/backends/platform/wince/Makefile b/backends/platform/wince/Makefile index a4b4fa4f12..03db1a5317 100644 --- a/backends/platform/wince/Makefile +++ b/backends/platform/wince/Makefile @@ -52,6 +52,7 @@ USE_ZLIB = 1 #DISABLE_HQ_SCALERS = 1 USE_ARM_SOUND_ASM = 1 USE_ARM_SMUSH_ASM = 1 +USE_ARM_GFX_ASM = 1 ######################################################################## @@ -85,10 +86,6 @@ DEFINES += -DNONSTANDARD_PORT DEFINES += -DWIN32 DEFINES += -D__stdcall= -Dcdecl= -D__cdecl__= -D__cdecl= -Wno-multichar -ifdef WINCE_DEBUG_BUILD -DEFINES += -DDEBUG -DUSE_WINDBG -g -endif - INCLUDES := -I$(srcdir) -I. -I$(srcdir)/engines -Imissing/gcc -Ilibs/include -Ilibs/include/sdl -ICEgui -ICEkeys -I$(wince_gcc_root)/include CFLAGS := -O3 -march=armv4 -mtune=xscale @@ -98,6 +95,11 @@ CXXFLAGS := $(CFLAGS) LDFLAGS := -Llibs/lib -L$(wince_gcc_root)/lib LIBS := -lSDL +ifdef WINCE_DEBUG_BUILD +DEFINES += -DDEBUG -DUSE_WINDBG -g +LDFLAGS += -debug +endif + ifdef USE_ZLIB DEFINES += -DUSE_ZLIB LIBS += -lzlib @@ -129,8 +131,12 @@ DEFINES += -DUSE_FLAC LIBS += -lFLAC endif -ifdef USE_ARM_SMUSH -DEFINES += -DUSE_ARM_SMUSH +ifdef USE_ARM_SMUSH_ASM +DEFINES += -DUSE_ARM_SMUSH_ASM +endif + +ifdef USE_ARM_GFX_ASM +DEFINES += -DUSE_ARM_GFX_ASM endif LIBS += --entry WinMainCRTStartup |