- updated for 1.2.6-1.20030528.0

[packages/SDL.git] / SDL-noobjc.patch

diff -aurN SDL-1.2.orig/configure.in SDL-1.2/configure.in
--- SDL-1.2.orig/configure.in	2003-05-29 07:05:06.000000000 +0200
+++ SDL-1.2/configure.in	2003-07-21 23:21:20.000000000 +0200
@@ -2570,18 +2570,6 @@
 CXXFLAGS="$CFLAGS"
 
 
-# Check for darwin at the very end and set up the Objective C compiler
-# We do this here so that we get the full CFLAGS into OBJCFLAGS
-case "$target" in
-    *-*-darwin*)
-        OBJC="cc"
-        OBJCFLAGS="$CFLAGS"
-        OBJCDEPMODE="$CCDEPMODE"
-        AC_SUBST(OBJC)
-        AC_SUBST(OBJCFLAGS)
-        AC_SUBST(OBJCDEPMODE)
-        ;;
-esac
 
 # Finally create all the generated files
 dnl Important: Any directory that you want to be in the distcheck should
@@ -2638,7 +2626,6 @@
 src/video/picogui/Makefile
 src/video/ps2gs/Makefile
 src/video/qtopia/Makefile
-src/video/quartz/Makefile
 src/video/svga/Makefile
 src/video/vgl/Makefile
 src/video/wincommon/Makefile
diff -aurN SDL-1.2.orig/src/main/Makefile.am SDL-1.2/src/main/Makefile.am
--- SDL-1.2.orig/src/main/Makefile.am	2002-05-19 22:06:01.000000000 +0200
+++ SDL-1.2/src/main/Makefile.am	2003-07-21 23:20:21.000000000 +0200
@@ -14,15 +14,11 @@
 # Build a separate library containing the main() entry point.
 lib_LIBRARIES = libSDLmain.a
 
-if TARGET_MACOSX
-MAINLIB_ARCH_SRCS = SDLMain.m SDLMain.h
-else
 if TARGET_QTOPIA
 MAINLIB_ARCH_SRCS = SDL_Qtopia_main.cc
 else
 MAINLIB_ARCH_SRCS = SDL_main.c
 endif
-endif
 libSDLmain_a_SOURCES = $(MAINLIB_ARCH_SRCS)
 
 # Build an internal library of any special app setup functions