--- hatari/src/Makefile	2019/04/01 07:09:18	1.1.1.2
+++ hatari/src/Makefile	2019/04/01 07:13:27	1.1.1.13
@@ -1,48 +1,102 @@
-# Makefile for Hatari
+# Main Makefile for Hatari.
 
-# Set flags passed to the compiler (e.g. optimization flags)
-CMPLRFLAGS = -O3 -fomit-frame-pointer
+# 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
+
+# Select CPU directory:
+CPUDIR = uae-cpu
+
+# Include settings
+include ../Makefile.cnf
+
+# Additional include directories:
+CPPFLAGS += -I.. -I./includes -I$(CPUDIR) -I./falcon
+CPPFLAGS += -DCONFDIR=\"$(CONFDIR)\" $(SDL_CFLAGS)
+
+ifeq ($(ENABLE_DSP_EMU),1)
+CPPFLAGS += -DENABLE_DSP_EMU=1
+endif
+
+GUIOBJS = ./gui-sdl/dlgAbout.o ./gui-sdl/dlgAlert.o ./gui-sdl/dlgDevice.o \
+  ./gui-sdl/dlgDisk.o ./gui-sdl/dlgJoystick.o ./gui-sdl/dlgKeyboard.o \
+  ./gui-sdl/dlgMain.o ./gui-sdl/dlgMemory.o ./gui-sdl/dlgNewDisk.o \
+  ./gui-sdl/dlgRom.o ./gui-sdl/dlgScreen.o ./gui-sdl/dlgSound.o  \
+  ./gui-sdl/dlgSystem.o ./gui-sdl/dlgFileSelect.o ./gui-sdl/sdlgui.o
+
+GUIWINOBJS = ./gui-win/hatari-winicon.o ./gui-win/opencon.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
+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
 
-# Set the C compiler (e.g. gcc)
-CC = gcc
+OBJS = $(SRCS:.c=.o)
 
 
-SDLLIB=$(shell sdl-config --libs)
-SDLFLAGS=$(shell sdl-config --cflags)
+ALLOBJS = $(OBJS) $(GUIOBJS) $(CPUDIR)/cpu68k.a $(FALCOBJS)
 
-CFLAGS = -I./includes -I./uae-cpu $(CMPLRFLAGS) $(SDLFLAGS)
+ifeq ($(SYS_WINDOWS),1)
+  ALLOBJS += $(GUIWINOBJS)
+endif
+ifneq ($(strip $(shell gcc -v 2>&1 |grep "cygwin")),)
+  ALLOBJS += $(GUIWINOBJS)
+endif 
 
 
-CPUOBJS = ./uae-cpu/hatari-glue.o ./uae-cpu/memory.o ./uae-cpu/newcpu.o \
-  ./uae-cpu/readcpu.o ./uae-cpu/fpp.o ./uae-cpu/cpustbl.o ./uae-cpu/cpudefs.o \
-  ./uae-cpu/cpuemu1.o ./uae-cpu/cpuemu2.o ./uae-cpu/cpuemu3.o \
-  ./uae-cpu/cpuemu4.o ./uae-cpu/cpuemu5.o ./uae-cpu/cpuemu6.o \
-  ./uae-cpu/cpuemu7.o ./uae-cpu/cpuemu8.o
+all: hatari
 
-SRCS = audio.c bios.c cart.c configuration.c createBlankImage.c \
-  createDiscImage.c debug.c debugui.c dialog.c disass.c errlog.c fdc.c file.c \
-  floppy.c gemdos.c ikbd.c int.c intercept.c joy.c keymap.c m68000.c \
-  main.c midi.c memAlloc.c memorySnapShot.c mfp.c misc.c msa.c psg.c \
-  printer.c rs232.c reset.c st.c stMemory.c screen.c screenConvert.c \
-  screenSnapShot.c shortcut.c sound.c spec512.c statusBar.c timer.c \
-  tos.c vdi.c video.c view.c wavFormat.c xbios.c ymFormat.c
+hatari: $(ALLOBJS)
+	$(CC) $(LDFLAGS) $(ALLOBJS) $(SDL_LIBS) $(LIBS) -o hatari
 
-OBJS = $(SRCS:.c=.o)
+# Sub-folder dependencies:
+.PHONY : $(CPUDIR)/cpu68k.a
+$(CPUDIR)/cpu68k.a:
+	$(MAKE) -C $(CPUDIR)
+
+gui-sdl/%.o: gui-sdl/%.c
+	$(MAKE) ENABLE_DSP_EMU=$(ENABLE_DSP_EMU) -C gui-sdl/ all
 
+gui-win/%.o:
+	$(MAKE) ENABLE_DSP_EMU=$(ENABLE_DSP_EMU) -C gui-win/ all
 
-hatari: $(OBJS) cpu
-	$(CC) $(OBJS) $(CPUOBJS) $(SDLLIB) -o hatari
-	strip hatari
+falcon/%.o: falcon/%.c
+	$(MAKE) ENABLE_DSP_EMU=$(ENABLE_DSP_EMU) CPUDIR=$(CPUDIR) -C falcon/
 
-cpu:
-	$(MAKE) -C uae-cpu/ CFLAGS="$(CMPLRFLAGS)" CC="$(CC)" all
 
 clean:
-	rm -f *.o hatari
-	$(MAKE) -C uae-cpu/ clean
+	$(RM) *.o hatari
+	$(MAKE) -C gui-sdl/ clean
+	$(MAKE) -C gui-win/ clean
+	$(MAKE) -C $(CPUDIR) clean
+	$(MAKE) -C falcon/ clean
+
+distclean:
+	$(RM) *.o hatari
+	$(RM) Makefile.dep *~ *.bak *.orig
+	$(RM) convert/*~ convert/*.bak
+	$(MAKE) -C gui-sdl/ distclean
+	$(MAKE) -C gui-win/ distclean
+	$(MAKE) -C $(CPUDIR) distclean
+	$(MAKE) -C falcon/ distclean
+
+
+# Use "make depend" to generate file dependencies:
+Makefile.dep: Makefile
+	$(CC) -M $(CPPFLAGS) $(SRCS) > Makefile.dep
 
+depend: Makefile.dep
+	$(MAKE) -C gui-sdl/ depend
 
-screenConvert.o: convert/high640x1.c convert/low640x16.c convert/spec320x16.c \
-    convert/vdi4.c convert/high640x8.c convert/low640x8.c convert/spec640x16.c \
-    convert/low320x16.c convert/med640x16.c convert/vdi16.c \
-    convert/low320x8.c  convert/med640x8.c  convert/vdi2.c
+-include Makefile.dep