From c330907dba4f4196a30a0481485deea6e6a9f6ef Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Thu, 14 Sep 2017 21:03:20 +0100
Subject: [PATCH] Added a SDL12=1 flag to all ports whose interface code still
 lives in the sdl12 folder (and is unsupported by SDL 2.0 officially anyway)

This basically causes the makefile to use the sdl12 folder instead of the main sdl folder
---
 src/Makefile     |  8 +++++++-
 src/Makefile.cfg | 24 ++++++++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 426dc228..57bd0644 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -209,7 +209,13 @@ LIBS+=-lm
 endif
 
 ifdef SDL
-include sdl/Makefile.cfg
+#SDL 2.0
+ifndef SDL12
+	include sdl/Makefile.cfg
+#SDL 1.2
+else
+	include sdl12/Makefile.cfg
+endif #ifndef SDL12
 endif #ifdef SDL
 
 ifdef DISTCC
diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index 5bf7f247..3f619773 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -322,22 +322,24 @@ ifdef MINGW64
 	BIN:=$(BIN)/Mingw64
 else
 ifdef WII
-	INTERFACE=sdl
+	INTERFACE=sdl12
 	NONX86=1
 	STATIC=1
 	PREFIX?=powerpc-eabi
 	SDL=1
+	SDL12=1
 	SDLMAIN=1
 	OBJDIR:=$(OBJDIR)/Wii
 	BIN:=$(BIN)/Wii
 	NOUPX=1
 else
 ifdef PS3N
-	INTERFACE=sdl
+	INTERFACE=sdl12
 	NONX86=1
 	STATIC=1
 	PREFIX?=ppu
 	SDL=1
+	SDL12=1
 	# unsure?
 	#SDLMAIN=1
 	# can't compile SDL_mixer for ps3...
@@ -352,34 +354,38 @@ ifdef MINGW
 	BIN:=$(BIN)/Mingw
 else
 ifdef XBOX
-	INTERFACE=sdl
+	INTERFACE=sdl12
 	NASMFORMAT=win32
 	PREFIX?=/usr/local/openxdk/bin/i386-pc-xbox
 	SDL=1
+	SDL12=1
 	OBJDIR:=$(OBJDIR)/XBOX
 	BIN:=$(BIN)/XBOX
 else
 ifdef PSP
-	INTERFACE=sdl
+	INTERFACE=sdl12
 	NONX86=1
 	SDL=1
+	SDL12=1
 	OBJDIR:=$(OBJDIR)/PSP
 	BIN:=$(BIN)/PSP
 	NOUPX=1
 else
 ifdef DC
-	INTERFACE=sdl
+	INTERFACE=sdl12
 	NONX86=1
 	SDL=1
+	SDL12=1
 	OBJDIR:=$(OBJDIR)/DC
 	BIN:=$(BIN)/DC
 	NOUPX=1
 else
 ifdef WINCE
-	INTERFACE=sdl
+	INTERFACE=sdl12
 	NONX86=1
 	PREFIX?=arm-wince-pe
 	SDL=1
+	SDL12=1
 	OBJDIR:=$(OBJDIR)/WinCE
 	BIN:=$(BIN)/WinCE
 else
@@ -437,7 +443,13 @@ OBJDUMP_OPTS?=--wide --source --line-numbers
 LD=$(CC)
 
 ifdef SDL
+# SDL 2.0
+ifndef SDL12
 	INTERFACE=sdl
+# SDL 1.2
+else
+	INTERFACE=sdl12
+endif
 	OBJDIR:=$(OBJDIR)/SDL
 endif