aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorNebuleon Fumika2013-02-03 05:59:48 -0500
committerNebuleon Fumika2013-02-03 05:59:48 -0500
commit461f2406555faaee7191871390192d06625f5a81 (patch)
treeedbbc706e1b565855c2ae37289a622429b454988 /Makefile
parentfd92545013ed91d2867e1e180a9b86611eb19f9c (diff)
downloadsnes9x2005-461f2406555faaee7191871390192d06625f5a81.tar.gz
snes9x2005-461f2406555faaee7191871390192d06625f5a81.tar.bz2
snes9x2005-461f2406555faaee7191871390192d06625f5a81.zip
Fix a name clash between Snes9x's dma.h and the DS2 dma.h by renaming the DS2 dma.h to ds2_dma.h.
Add preliminary support for drawing emulated screens with DS2 DMA.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e0732d3..854a285 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ C_SOURCES = source/unzip/explode.c source/unzip/unreduce.c \
source/unzip/unshrink.c source/unzip/unzip.c \
source/nds/bdf_font.c source/nds/bitmap.c \
source/nds/draw.c source/nds/ds2_main.c source/nds/gcheat.c \
- source/nds/gui.c
+ source/nds/gui.c source/nds/dma_adj.c
CPP_SOURCES = source/apu.cpp source/apudebug.cpp source/c4.cpp \
source/c4emu.cpp source/cheats2.cpp source/cheats.cpp \
source/clip.cpp source/cpu.cpp source/cpuexec.cpp \
@@ -70,7 +70,8 @@ DEFS := -DSPC700_C -DEXECUTE_SUPERFX_PER_LINE -DSDD1_DECOMP \
-DVAR_CYCLES -DCPU_SHUTDOWN -DSPC700_SHUTDOWN \
-DNO_INLINE_SET_GET -DNOASM -DHAVE_MKSTEMP '-DACCEPT_SIZE_T=size_t' \
-DUNZIP_SUPPORT -DFOREVER_16_BIT_SOUND -DFOREVER_STEREO \
- -DFOREVER_FORWARD_STEREO -DNO_VOLATILE_SOUND -DSYNC_JOYPAD_AT_HBLANK
+ -DFOREVER_FORWARD_STEREO -DNO_VOLATILE_SOUND \
+ -DSYNC_JOYPAD_AT_HBLANK -DDS2_DMA
.PHONY: clean makedirs
.SUFFIXES: .elf .dat .plg