diff options
author | Max Horn | 2010-07-07 23:22:53 +0000 |
---|---|---|
committer | Max Horn | 2010-07-07 23:22:53 +0000 |
commit | fe72d5dd7842312606b350785f2fac2b2824fcb6 (patch) | |
tree | e9b77658156257e603f1fb11d17d3e0192eab83a /backends/platform/ds/module.mk | |
parent | 9add81aaf2aa992252be36d9a2f9f2cec0e41eea (diff) | |
download | scummvm-rg350-fe72d5dd7842312606b350785f2fac2b2824fcb6.tar.gz scummvm-rg350-fe72d5dd7842312606b350785f2fac2b2824fcb6.tar.bz2 scummvm-rg350-fe72d5dd7842312606b350785f2fac2b2824fcb6.zip |
DS: Fix some quirks in the NDS build system, remove some dead code
* remove (S)RAM save code (it has not been in use for quite some time)
* remove the lz compressor (was only used by ram save code)
* OPT_SPEED was set incorrectly
* dsmain.cpp was misspelled as ds_main.cpp
* remove unsed arm9 libcartreset (the copy in the arm7 directory
still is around, though)
svn-id: r50741
Diffstat (limited to 'backends/platform/ds/module.mk')
-rw-r--r-- | backends/platform/ds/module.mk | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/backends/platform/ds/module.mk b/backends/platform/ds/module.mk index e3c18c7174..44cba006df 100644 --- a/backends/platform/ds/module.mk +++ b/backends/platform/ds/module.mk @@ -12,7 +12,6 @@ PORT_OBJS := \ arm9/source/gbampsave.o \ arm9/source/scummhelp.o \ arm9/source/osystem_ds.o \ - arm9/source/ramsave.o \ arm9/source/touchkeyboard.o \ arm9/source/zipreader.o \ arm9/source/dsoptions.o \ @@ -27,9 +26,9 @@ DATA_OBJS := \ arm9/data/default_font.o \ arm9/data/8x8font_tga.o -COMPRESSOR_OBJS := #arm9/source/compressor/lz.o - -FAT_OBJS := arm9/source/fat/disc_io.o arm9/source/fat/gba_nds_fat.o\ +FAT_OBJS := \ + arm9/source/fat/disc_io.o \ + arm9/source/fat/gba_nds_fat.o \ arm9/source/fat/io_fcsr.o \ arm9/source/fat/io_m3cf.o \ arm9/source/fat/io_mpcf.o \ @@ -50,12 +49,9 @@ FAT_OBJS := arm9/source/fat/disc_io.o arm9/source/fat/gba_nds_fat.o\ # arm9/source/fat/io_sd_common.o arm9/source/fat/io_scsd_s.o \ # arm9/source/fat/io_sc_common.o arm9/source/fat/io_sd_common.o -LIBCARTRESET_OBJS := \ -# arm9/source/libcartreset/cartreset.o - #MODULE_OBJS := $(PORT_OBJS) $(DATA_OBJS) $(FAT_OBJS) -MODULE_OBJS := $(DATA_OBJS) $(LIBCARTRESET_OBJS) $(PORT_OBJS) $(COMPRESSOR_OBJS) $(FAT_OBJS) +MODULE_OBJS := $(DATA_OBJS) $(PORT_OBJS) $(FAT_OBJS) #--------------------------------------------------------------------------------- @@ -113,8 +109,7 @@ MODULE_DIRS += \ backends/platform/ds/arm7/source/ \ backends/platform/ds/arm7/source/libcartreset/ \ backends/platform/ds/arm9/source/ \ - backends/platform/ds/arm9/source/fat/ \ - backends/platform/ds/arm9/source/libcartreset/ + backends/platform/ds/arm9/source/fat/ # We don't use the rules.mk here on purpose OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS) |