--- hatari/src/Makefile	2019/04/01 07:09:53	1.1.1.4
+++ hatari/src/Makefile	2019/04/01 07:10:47	1.1.1.7
@@ -1,23 +1,29 @@
 # Makefile for Hatari
 
-# Set flags passed to the compiler (e.g. optimization flags)
-CMPLRFLAGS = -O3 -fomit-frame-pointer
-
 # Set the C compiler (e.g. gcc)
 CC = gcc
 
+# Set flags passed to the compiler (e.g. optimization flags)
+CMPLRFLAGS = -O3 -fomit-frame-pointer -Wall -Wno-unused
+
 # Here you can define the default data directory for Hatari where it
 # looks for the default TOS image etc.
 # For example you can use the local directory with . or if you want to do
 # a system-wide installation, use something like /usr/share/hatari
 DATADIR = .
 
-# SDL-Library configuration:
-SDLLIB=$(shell sdl-config --libs)
-SDLFLAGS=$(shell sdl-config --cflags)
+# SDL-Library configuration - you don't have to change this if you have
+# correctly installed the SDL library and if you are using GNU make!
+SDLLIB = $(shell sdl-config --libs)
+SDLFLAGS = $(shell sdl-config --cflags)
 
+# Additional include directories:
+INCFLAGS = -I./includes -I./uae-cpu
 
-CFLAGS = -I./includes -I./uae-cpu $(CMPLRFLAGS) $(SDLFLAGS)
+# Additional libaries:
+LIBFLAGS = -lz
+
+CFLAGS = $(CMPLRFLAGS) $(INCFLAGS) $(SDLFLAGS)
 
 
 CPUOBJS = ./uae-cpu/hatari-glue.o ./uae-cpu/memory.o ./uae-cpu/newcpu.o \
@@ -26,23 +32,23 @@ CPUOBJS = ./uae-cpu/hatari-glue.o ./uae-
   ./uae-cpu/cpuemu4.o ./uae-cpu/cpuemu5.o ./uae-cpu/cpuemu6.o \
   ./uae-cpu/cpuemu7.o ./uae-cpu/cpuemu8.o
 
-SRCS = audio.c bios.c cart.c configuration.c createBlankImage.c \
-  createDiscImage.c debug.c debugui.c dialog.c errlog.c fdc.c file.c \
-  floppy.c gemdos.c hdc.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 sdlgui.c shortcut.c sound.c spec512.c timer.c \
-  tos.c vdi.c video.c wavFormat.c xbios.c ymFormat.c
+SRCS = audio.c bios.c blitter.c cart.c cfgopts.c configuration.c \
+  createBlankImage.c createDiscImage.c debug.c debugui.c dialog.c errlog.c \
+  fdc.c file.c floppy.c gemdos.c hdc.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 rtc.c st.c stMemory.c screen.c screenConvert.c \
+  screenSnapShot.c sdlgui.c shortcut.c sound.c spec512.c \
+  tos.c unzip.c vdi.c video.c wavFormat.c xbios.c ymFormat.c zip.c
 
 OBJS = $(SRCS:.c=.o)
 
 
 hatari: $(OBJS) cpu
-	$(CC) $(OBJS) $(CPUOBJS) $(SDLLIB) -o hatari
+	$(CC) $(OBJS) $(CPUOBJS) $(SDLLIB) $(LIBFLAGS) -o hatari
 	strip hatari
 
 cpu:
-	$(MAKE) -C uae-cpu/ CFLAGS="$(CMPLRFLAGS) $(SDLFLAGS)" CC="$(CC)" all
+	$(MAKE) -C uae-cpu/ CC="$(CC)" CMPLRFLAGS="$(CMPLRFLAGS)" SDLFLAGS="$(SDLFLAGS)" all
 
 clean:
 	rm -f *.o hatari
@@ -55,7 +61,12 @@ configuration.o: configuration.c
 sdlgui.o: sdlgui.c
 	$(CC) $(CFLAGS) -c -DDATADIR=\"$(DATADIR)\" sdlgui.c -o sdlgui.o
 
-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
+
+# Use "make depend" to generate file dependencies:
+depend: $(SRCS)
+	$(CC) -MM $(CFLAGS) $(SRCS) > Makefile.dep
+
+ifneq (,$(wildcard Makefile.dep))
+include Makefile.dep
+endif
+