From 5798d4e18a75a855f0cb677d119151e453782b0e Mon Sep 17 00:00:00 2001
From: freetz <freetz@pld-linux.org>
Date: Mon, 21 Jul 2003 22:20:05 +0000
Subject: [PATCH] - updated for 1.2.6-1.20030528.0

Changed files:
    SDL-noobjc.patch -> 1.2
---
 SDL-noobjc.patch | 54 +++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/SDL-noobjc.patch b/SDL-noobjc.patch
index 2ffa3e4..7235241 100644
--- a/SDL-noobjc.patch
+++ b/SDL-noobjc.patch
@@ -1,24 +1,7 @@
---- SDL-1.2.5/src/main/Makefile.am.orig	Sun May 19 22:06:01 2002
-+++ SDL-1.2.5/src/main/Makefile.am	Sun Oct 13 21:04:54 2002
-@@ -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
---- SDL-1.2.5/configure.in.orig	Sun Oct 13 20:59:37 2002
-+++ SDL-1.2.5/configure.in	Sun Oct 13 21:06:35 2002
-@@ -2548,18 +2549,6 @@
+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"
  
  
@@ -37,11 +20,30 @@
  
  # Finally create all the generated files
  dnl Important: Any directory that you want to be in the distcheck should
-@@ -2613,7 +2602,6 @@
- src/video/maccommon/Makefile
- src/video/macdsp/Makefile
- src/video/macrom/Makefile
+@@ -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/aalib/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
-- 
2.44.0