--- hatari/src/Makefile	2019/04/09 08:47:00	1.1.1.15
+++ hatari/src/Makefile	2019/04/09 08:48:26	1.1.1.17
@@ -11,32 +11,33 @@ CPUDIR = uae-cpu
 include ../Makefile.cnf
 
 # Additional include directories:
-CPPFLAGS += -I.. -I./includes -I$(CPUDIR) -I./falcon
-CPPFLAGS += -DCONFDIR=\"$(CONFDIR)\" $(SDL_CFLAGS)
+CPPFLAGS += -I.. -I./includes -I$(CPUDIR) -I./debug -I./falcon \
+ -DCONFDIR=\"$(CONFDIR)\" $(SDL_CFLAGS) $(PNG_CFLAGS) $(X11_CFLAGS)
 
 ifeq ($(ENABLE_DSP_EMU),1)
 CPPFLAGS += -DENABLE_DSP_EMU=1
 endif
 
-SRCS = audio.c bios.c blitter.c breakcond.c cart.c cfgopts.c \
+SRCS = audio.c avi_record.c bios.c blitter.c cart.c cfgopts.c \
   configuration.c options.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
+  cycInt.c cycles.c dialog.c dim.c dmaSnd.c fdc.c file.c floppy.c \
+  gemdos.c hd6301_cpu.c hdc.c ide.c ikbd.c ioMem.c ioMemTabST.c \
+  ioMemTabSTE.c ioMemTabTT.c ioMemTabFalcon.c joy.c keymap.c m68000.c \
+  main.c midi.c memorySnapShot.c mfp.c msa.c paths.c  psg.c printer.c \
+  resolution.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)
 
-SUBDIRLIBS = $(CPUDIR)/cpu68k.a falcon/falcon.a gui-sdl/gui-sdl.a
+SUBDIRLIBS = $(CPUDIR)/cpu68k.a debug/debug.a falcon/falcon.a gui-sdl/gui-sdl.a
 
 ifeq ($(SYS_WINDOWS),1)
-  SUBDIRLIBS += gui-win/gui-win.a
+  SUBDIRLIBS += gui-win/gui-win.a 
+  OBJS += gui-win/hatari-winicon.o
 else
 ifneq ($(strip $(shell gcc -v 2>&1 |grep "cygwin")),)
-  SUBDIRLIBS += gui-win/gui-win.a
+  SUBDIRLIBS += gui-win/gui-win.a 
 endif 
 endif
 
@@ -49,8 +50,10 @@ all: ../Makefile.cnf
 	$(MAKE) $(SUBDIRS)
 	$(MAKE) hatari
 
+LIBS := $(PORTAUDIO_LIBS) $(PNG_LIBS) $(SDL_LIBS) $(X11_LIBS) $(LIBS)
+
 hatari: $(ALLOBJS)
-	$(CC) $(LDFLAGS) $(ALLOBJS) $(SDL_LIBS) $(LIBS) -o hatari
+	$(CC) $(LDFLAGS) $(ALLOBJS) $(LIBS) -o hatari
 
 # Sub-folder dependencies:
 .PHONY : $(SUBDIRS)
@@ -64,6 +67,7 @@ clean:
 	$(MAKE) -C gui-win/ clean
 	$(MAKE) -C $(CPUDIR) clean
 	$(MAKE) -C falcon/ clean
+	$(MAKE) -C debug/ clean
 
 distclean:
 	$(RM) *.o hatari
@@ -73,6 +77,7 @@ distclean:
 	$(MAKE) -C gui-win/ distclean
 	$(MAKE) -C $(CPUDIR) distclean
 	$(MAKE) -C falcon/ distclean
+	$(MAKE) -C debug/ distclean
 
 
 # Use "make depend" to generate file dependencies:
@@ -86,6 +91,7 @@ depend:
 	$(MAKE) -C gui-sdl/ depend
 	$(MAKE) -C $(CPUDIR) depend
 	$(MAKE) -C falcon/ depend
+	$(MAKE) -C debug/ depend
 
 .PHONY : cleandeps
 cleandeps: