From 075268f0fd9b4e600cf4b27314f05ead330c7500 Mon Sep 17 00:00:00 2001
From: "R. Belmont" <rb6502@users.noreply.github.com>
Date: Wed, 3 Sep 2014 01:58:02 +0000
Subject: [PATCH] SDL: more OS X fixes for SDL2. (nw)

---
 src/osd/sdl/SDLMain_tmpl.m | 2 +-
 src/osd/sdl/sdl.mak        | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/osd/sdl/SDLMain_tmpl.m b/src/osd/sdl/SDLMain_tmpl.m
index 3ddd1f0f5ee..78b5d7f4937 100644
--- a/src/osd/sdl/SDLMain_tmpl.m
+++ b/src/osd/sdl/SDLMain_tmpl.m
@@ -7,7 +7,7 @@
     Feel free to customize this file to suit your needs
 */
 
-#import "SDL/SDL.h"
+#import "sdlinc.h"
 #import "SDLMain_tmpl.h"
 #import <sys/param.h> /* for MAXPATHLEN */
 #import <unistd.h>
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index 05f776bb7ac..30e27178c7c 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -272,8 +272,13 @@ DEBUGOBJS = $(OSDOBJ)/modules/debugger/debugosx.o
 endif
 
 SYNC_IMPLEMENTATION = ntc
+
+# SDLMain_tmpl isn't necessary for SDL2
+ifneq ($(SDL_LIBVER),sdl2)
 SDLMAIN = $(SDLOBJ)/SDLMain_tmpl.o
 SDLUTILMAIN = $(SDLOBJ)/SDLMain_tmpl.o
+endif
+
 SDL_NETWORK = pcap
 MAINLDFLAGS = -Xlinker -all_load
 NO_X11 = 1