--- hatari/tools/hmsa/Makefile	2019/04/01 07:15:07	1.1.1.2
+++ hatari/tools/hmsa/Makefile	2019/04/09 08:49:02	1.1.1.4
@@ -1,18 +1,19 @@
 # Makefile for Hatari MSA
 
+# Include settings
+include ../../Makefile.cnf
+
 HMSA_OBJS = hmsa.o floppy.o
 HATARI_OBJS = msa.o dim.o st.o file.o unzip.o zip.o
 OBJS = $(HMSA_OBJS) $(HATARI_OBJS:%.o=../../src/%.o)
 
-CFLAGS = -g -O -Wall -I../.. -I../../src/includes -I../../src/uae-cpu \
-	$(shell sdl-config --cflags)
-
-LIBS = -lz
+# Additional include directories:
+CPPFLAGS += $(SDL_CFLAGS) -I../.. -I../../src/includes -I../../src/debug -I../../src/uae-cpu
 
 all: hmsa
 
 hmsa: $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) -o hmsa
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o hmsa
 
 clean:
 	$(RM) *.o hmsa