diff options
| author | Neil Millstone | 2008-05-15 22:12:51 +0000 |
|---|---|---|
| committer | Neil Millstone | 2008-05-15 22:12:51 +0000 |
| commit | 2c5e8cc93861cded0b9a8ca7c605c61c7c2acc31 (patch) | |
| tree | f5c0b1d4914d85d5f09eab5b739fbf9a4c3b59a8 /backends/platform/ds/arm9/makefile | |
| parent | defc030143487550057cac1fb617d31ce9ab1ab2 (diff) | |
| download | scummvm-rg350-2c5e8cc93861cded0b9a8ca7c605c61c7c2acc31.tar.gz scummvm-rg350-2c5e8cc93861cded0b9a8ca7c605c61c7c2acc31.tar.bz2 scummvm-rg350-2c5e8cc93861cded0b9a8ca7c605c61c7c2acc31.zip | |
Porting changes from 0.11.0 branch
svn-id: r32140
Diffstat (limited to 'backends/platform/ds/arm9/makefile')
| -rw-r--r-- | backends/platform/ds/arm9/makefile | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile index 787e15a03b..aefd8c091e 100644 --- a/backends/platform/ds/arm9/makefile +++ b/backends/platform/ds/arm9/makefile @@ -34,10 +34,10 @@ ifeq ($(SCUMM_BUILD),g) DS_BUILD_G = 1 endif -#DS_BUILD_A = 1 +DS_BUILD_A = 1 #DS_BUILD_B = 1 #DS_BUILD_C = 1 -#DS_BUILD_D = 1 # started! +#DS_BUILD_D = 1 #DS_BUILD_E = 1 #DS_BUILD_F = 1 #DS_BUILD_G = 1 @@ -82,11 +82,15 @@ VPATH = $(srcdir) USE_ARM_SOUND_ASM = 1 ARM = 1 +USE_ARM_COSTUME_ASM = 1 ifdef DS_BUILD_A - DEFINES = -DDS_SCUMM_BUILD -DDS_BUILD_A -DUSE_ARM_GFX_ASM + DEFINES = -DDS_SCUMM_BUILD -DDS_BUILD_A -DUSE_ARM_GFX_ASM -DUSE_ARM_COSTUME_ASM LOGO = logoa.bmp ENABLE_SCUMM = STATIC_PLUGIN + DEFINES += -DENABLE_SCUMM=STATIC_PLUGIN + MODULES += engines/scumm + USE_ARM_GFX_ASM = 1 BUILD=scummvm-A endif @@ -146,10 +150,12 @@ CXX = arm-eabi-g++ CFLAGS = -Wno-multichar -Wall\ -Wno-multichar -mcpu=arm9tdmi -mtune=arm9tdmi \ -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer\ - -ffast-math -mthumb-interwork + -mthumb-interwork -DUSE_ARM_COSTUME_ASM=1 + +# -ffast-math ifdef USE_DEBUGGER - DEFINES += -DUSE_DEBUGGER + DEFINES += -DUSE_DEBUGGER CFLAGS += -g endif @@ -258,14 +264,18 @@ OPTLIST := actor.cpp ds_main.cpp osystem_ds.cpp blitters.cpp fmopl.cpp rate.cpp #OPTLIST := # Compiler options for files which should be optimised for speed -OPT_SPEED := -O3 +OPT_SPEED := -O2 # Compiler options for files which should be optimised for space -OPT_SIZE := -Os -mthumb -fno-gcse -fno-schedule-insns2 +OPT_SIZE := -Os +#-mthumb -fno-gcse -fno-schedule-insns2 -OBJS := $(DATA_OBJS) $(LIBCARTRESET_OBJS) $(PORT_OBJS) $(COMPRESSOR_OBJS) $(FAT_OBJS) + + +OBJS := $(DATA_OBJS) $(LIBCARTRESET_OBJS) $(PORT_OBJS) $(COMPRESSOR_OBJS) $(FAT_OBJS) + @@ -331,8 +341,7 @@ ifndef HAVE_GCC3 # If you use GCC, disable the above and enable this for intelligent # dependency tracking. #.cpp.o: -%.o: %.cpp - +%.o:%.cpp $(MKDIR) $(*D)/$(DEPDIR) $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o # $(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d @@ -344,7 +353,7 @@ else # Also, with this GCC inserts additional dummy rules for the involved headers, # which ensures a smooth compilation even if said headers become obsolete. #.cpp.o: -%.o: %.cpp +%.o:%.cpp # echo !!!!!!!!!!!! $(notdir $<) # ifeq ( $(notdir $<), $(findstring $(notdir $<), $(OPTLIST)) ) # OPTFLAG=-O3 |