Disable SDLmain.m for SDL2.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12093 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=45f4690471d588436f2033dc5af008d40d57b36b

diff --git a/SDLMain.m b/SDLMain.m
index 2434f81aa9b7389770550961a8c61d9f6018dc86..6eadb9ee60f3b483e55be43e4fd36053e5a30850 100644 (file)
--- a/SDLMain.m
+++ b/SDLMain.m
@@ -5,7 +5,10 @@
     Feel free to customize this file to suit your needs
 */
 
-#include "SDL.h"
+#include <SDL.h>
+
+#if SDL_MAJOR_VERSION == 1
+
 #include "SDLMain.h"
 #include <sys/param.h> /* for MAXPATHLEN */
 #include <unistd.h>
@@ -379,3 +382,4 @@ int main (int argc, char **argv)
     return 0;
 }
 
+#endif

diff --git a/makefile.inc b/makefile.inc
index 3dfd1c525fde9ff2c5854ea43e6e6bed4978ed13..c7e98d22ab8a1d60112496e8cf9c31067972c9a3 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -241,7 +241,7 @@ OBJ_MACOSXCD=$(OBJ_NOCD)
 # Link
 LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit -framework Carbon $(LIB_SOUND)
 LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
-LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit $(SDLCONFIG_STATICLIBS)
+LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit $(SDLCONFIG_STATICLIBS) ../../../SDLMain.m
 
 OBJ_AGL= builddate.c sys_linux.o vid_agl.o thread_null.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)