diff --git a/Makefile b/Makefile
index c0d7108..6e51bcb 100644
--- a/Makefile
+++ b/Makefile
@@ -3,20 +3,25 @@ ifeq ($(PLATFORM),win64)
 	CROSS_COMPILE = x86_64-w64-mingw32-
 	EXTENSION = .exe
 	SHORT_PLATFORM = win
+	LDFLAGS += -lSDL2
 else ifeq ($(PLATFORM),win32)
 	CROSS_COMPILE = i686-w64-mingw32-
 	EXTENSION = .exe
 	SHORT_PLATFORM = win
+	LDFLAGS += -lSDL2
+else
+	CFLAGS += $(shell sdl2-config --cflags)
+	LDFLAGS += $(shell sdl2-config --libs)
 endif
 
 ifneq ($(PLATFORM),)
-	DIR_SUFFIX=-$(PLATFORM)
+	DIR_SUFFIX = -$(PLATFORM)
 endif
 
 
 CC = $(CROSS_COMPILE)gcc
 LD = $(CC)
-PFLAGS = -g
+PFLAGS += -g
 #PFLAGS += -O3
 #PFLAGS += -s
 #PFLAGS += -DDEBUG_MAPPER
@@ -25,12 +30,10 @@ PFLAGS = -g
 #PFLAGS += -DDEBUG_APU
 #PFLAGS += -DE6502_DEBUG
 PFLAGS += -DE6502_ILLEGAL
-CFLAGS = $(PFLAGS) -Wall -Werror -Wshadow -Wunused -I../ -Isrc/
-CFLAGS += -Iinc/$(PLATFORM) -I../inc/$(PLATFORM)
-CFLAGS += $(shell sdl2-config --cflags)
-LDFLAGS = $(PFLAGS)
+CFLAGS += $(PFLAGS) -Wall -Werror -Wshadow -Wunused -I../ -Isrc/
+CFLAGS += -Iinc/$(PLATFORM)/SDL2
+LDFLAGS += $(PFLAGS)
 LDFLAGS += -Llib/$(PLATFORM)
-LDFLAGS += $(shell sdl2-config --libs)
 
 OBJDIR = obj$(DIR_SUFFIX)
 SRCDIR = src
@@ -70,7 +73,7 @@ clean: ; rm -rf obj*/ bin*/
 
 $(BINDIR)/$(TARGET_1): $(OBJS_1)
 	@mkdir -p $(@D)
-	$(LD) $(LDFLAGS) $^ $(LDLIBS_1) -o $@
+	$(LD) $^ $(LDFLAGS) -o $@
 
 $(OBJDIR)/%.o: %.c
 	@mkdir -p $(@D)