--- hatari/src/Makefile	2019/04/01 07:13:27	1.1.1.13
+++ hatari/src/Makefile	2019/04/01 07:14:31	1.1.1.14
@@ -1,10 +1,8 @@
 # Main Makefile for Hatari.
 
-# Set ENABLE_DSP_EMU to 1 to enable experimental DSP emulation code
-# (there are currently no known programs which this would help,
-# but it will make many of the Falcon programs not to work).
-# If you change this, do "make clean"
-ENABLE_DSP_EMU = 0
+# Use "export ENABLE_DSP_EMU=0" & "make clean"
+# to disable experimental DSP emulation code.
+ENABLE_DSP_EMU ?= 1
 
 # Select CPU directory:
 CPUDIR = uae-cpu
@@ -30,17 +28,18 @@ GUIWINOBJS = ./gui-win/hatari-winicon.o
 
 FALCOBJS = ./falcon/videl.o ./falcon/hostscreen.o ./falcon/nvram.o
 ifeq ($(ENABLE_DSP_EMU),1)
-FALCOBJS += ./falcon/dsp.o ./falcon/dsp_cpu.o ./falcon/dsp_disasm.o
+FALCOBJS += ./falcon/dsp.o ./falcon/dsp_core.o \
+            ./falcon/dsp_cpu.o ./falcon/dsp_disasm.o
 endif
 
 SRCS = audio.c bios.c blitter.c cart.c cfgopts.c configuration.c options.c \
-  createBlankImage.c cycles.c debugui.c dialog.c dim.c dmaSnd.c fdc.c file.c \
-  floppy.c gemdos.c hdc.c ide.c ikbd.c int.c ioMem.c ioMemTabST.c \
-  ioMemTabSTE.c ioMemTabTT.c ioMemTabFalcon.c joy.c keymap.c paths.c \
-  log.c m68000.c main.c midi.c memorySnapShot.c mfp.c misc.c msa.c psg.c \
-  printer.c rs232.c reset.c rtc.c scandir.c st.c stMemory.c screen.c \
-  screenSnapShot.c shortcut.c sound.c spec512.c trace.c tos.c unzip.c \
-  vdi.c video.c wavFormat.c xbios.c ymFormat.c zip.c
+  createBlankImage.c change.c control.c cycles.c debugui.c dialog.c dim.c \
+  dmaSnd.c fdc.c file.c floppy.c gemdos.c hdc.c ide.c ikbd.c int.c ioMem.c \
+  ioMemTabST.c ioMemTabSTE.c ioMemTabTT.c ioMemTabFalcon.c joy.c keymap.c \
+  log.c m68000.c main.c midi.c memorySnapShot.c mfp.c msa.c paths.c \
+  psg.c printer.c rs232.c reset.c rtc.c scandir.c st.c stMemory.c screen.c \
+  screenSnapShot.c shortcut.c sound.c spec512.c statusbar.c str.c tos.c \
+  unzip.c utils.c vdi.c video.c wavFormat.c xbios.c ymFormat.c zip.c
 
 OBJS = $(SRCS:.c=.o)
 
@@ -49,10 +48,11 @@ ALLOBJS = $(OBJS) $(GUIOBJS) $(CPUDIR)/c
 
 ifeq ($(SYS_WINDOWS),1)
   ALLOBJS += $(GUIWINOBJS)
-endif
+else
 ifneq ($(strip $(shell gcc -v 2>&1 |grep "cygwin")),)
   ALLOBJS += $(GUIWINOBJS)
 endif 
+endif
 
 
 all: hatari
@@ -96,7 +96,12 @@ distclean:
 Makefile.dep: Makefile
 	$(CC) -M $(CPPFLAGS) $(SRCS) > Makefile.dep
 
-depend: Makefile.dep
+depend: cleandeps Makefile.dep
 	$(MAKE) -C gui-sdl/ depend
+	$(MAKE) -C $(CPUDIR) depend
+	$(MAKE) -C falcon/ depend
+
+cleandeps:
+	$(RM) Makefile.dep */Makefile.dep
 
 -include Makefile.dep