MacOS Classic is no longer supported.

libsdl-org · Aug 10, 2006 · 3b1aef8 · 3b1aef8
1 parent aabdbfe
commit 3b1aef8
Show file tree

Hide file tree

Showing 47 changed files with 4 additions and 6,961 deletions.
diff --git a/CWprojects.sea.bin b/CWprojects.sea.bin
diff --git a/MPWmake.sea.bin b/MPWmake.sea.bin
diff --git a/Makefile.in b/Makefile.in
@@ -38,7 +38,7 @@ SDLMAIN_TARGET = libSDLmain.a
 SDLMAIN_SOURCES = @SDLMAIN_SOURCES@
 SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
 
-DIST = acinclude.m4 autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS CWprojects.sea.bin docs docs.html EpocBuildFiles.zip include INSTALL Makefile.dc Makefile.minimal Makefile.in MPWmake.sea.bin README* sdl-config.in sdl.m4 sdl.pc.in SDL.qpg.in SDL.spec SDL.spec.in src test TODO VisualCE.zip VisualC.html VisualC.zip Watcom-OS2.zip Watcom-Win32.zip WhatsNew Xcode.tar.gz
+DIST = acinclude.m4 autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS docs docs.html EpocBuildFiles.zip include INSTALL Makefile.dc Makefile.minimal Makefile.in README* sdl-config.in sdl.m4 sdl.pc.in SDL.qpg.in SDL.spec SDL.spec.in src test TODO VisualCE.zip VisualC.html VisualC.zip Watcom-OS2.zip Watcom-Win32.zip WhatsNew Xcode.tar.gz
 
 LT_AGE      = @LT_AGE@
 LT_CURRENT  = @LT_CURRENT@

diff --git a/include/SDL_config.h.default b/include/SDL_config.h.default
@@ -30,8 +30,6 @@
 #include "SDL_config_amiga.h"
 #elif defined(__DREAMCAST__)
 #include "SDL_config_dreamcast.h"
-#elif defined(__MACOS__)
-#include "SDL_config_macos.h"
 #elif defined(__MACOSX__)
 #include "SDL_config_macosx.h"
 #elif defined(__WIN32__)

diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
@@ -184,7 +184,6 @@
 #undef SDL_CDROM_DUMMY
 #undef SDL_CDROM_FREEBSD
 #undef SDL_CDROM_LINUX
-#undef SDL_CDROM_MACOS
 #undef SDL_CDROM_MACOSX
 #undef SDL_CDROM_MINT
 #undef SDL_CDROM_OPENBSD
@@ -203,7 +202,6 @@
 #undef SDL_JOYSTICK_IOKIT
 #undef SDL_JOYSTICK_LINUX
 #undef SDL_JOYSTICK_LINUXEV
-#undef SDL_JOYSTICK_MACOS
 #undef SDL_JOYSTICK_MINT
 #undef SDL_JOYSTICK_OS2
 #undef SDL_JOYSTICK_RISCOS
@@ -217,7 +215,6 @@
 #undef SDL_LOADSO_DLOPEN
 #undef SDL_LOADSO_DUMMY
 #undef SDL_LOADSO_LDG
-#undef SDL_LOADSO_MACOS
 #undef SDL_LOADSO_OS2
 #undef SDL_LOADSO_WIN32
 
@@ -240,7 +237,6 @@
 #undef SDL_TIMER_DC
 #undef SDL_TIMER_DUMMY
 #undef SDL_TIMER_EPOC
-#undef SDL_TIMER_MACOS
 #undef SDL_TIMER_MINT
 #undef SDL_TIMER_OS2
 #undef SDL_TIMER_RISCOS
@@ -254,7 +250,6 @@
 #undef SDL_VIDEO_DRIVER_CYBERGRAPHICS
 #undef SDL_VIDEO_DRIVER_DC
 #undef SDL_VIDEO_DRIVER_DIRECTFB
-#undef SDL_VIDEO_DRIVER_DRAWSPROCKET
 #undef SDL_VIDEO_DRIVER_DUMMY
 #undef SDL_VIDEO_DRIVER_EPOC
 #undef SDL_VIDEO_DRIVER_FBCON
@@ -268,7 +263,6 @@
 #undef SDL_VIDEO_DRIVER_PS2GS
 #undef SDL_VIDEO_DRIVER_RISCOS
 #undef SDL_VIDEO_DRIVER_SVGALIB
-#undef SDL_VIDEO_DRIVER_TOOLBOX
 #undef SDL_VIDEO_DRIVER_VGL
 #undef SDL_VIDEO_DRIVER_WIN32
 #undef SDL_VIDEO_DRIVER_WSCONS

diff --git a/include/SDL_config_macos.h b/include/SDL_config_macos.h
diff --git a/include/SDL_main.h b/include/SDL_main.h
@@ -29,7 +29,6 @@
 
 #if defined(__WIN32__) || \
     (defined(__MWERKS__) && !defined(__BEOS__)) || \
-    defined(__MACOS__) || \
     defined(__SYMBIAN32__) || defined(QWS)
 
 #ifdef __cplusplus
@@ -76,30 +75,6 @@ extern DECLSPEC void SDLCALL SDL_UnregisterApp(void);
 #include "close_code.h"
 #endif
 
-/* From the SDL library code -- needed for registering QuickDraw on MacOS */
-#if defined(__MACOS__)
-
-#include "begin_code.h"
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* Forward declaration so we don't need to include QuickDraw.h */
-struct QDGlobals;
-
-/* This should be called from your main() function, if any */
-extern DECLSPEC void SDLCALL SDL_InitQuickDraw(struct QDGlobals *the_qd);
-
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-#endif
-
 #endif /* Need to redefine main()? */
 
 #endif /* _SDL_main_h */

diff --git a/include/SDL_opengl.h b/include/SDL_opengl.h
@@ -37,9 +37,6 @@
 #if defined(__MACOSX__)
 #include <OpenGL/gl.h>          /* Header File For The OpenGL Library */
 #include <OpenGL/glu.h>         /* Header File For The GLU Library */
-#elif defined(__MACOS__)
-#include <gl.h>                 /* Header File For The OpenGL Library */
-#include <glu.h>                /* Header File For The GLU Library */
 #else
 #include <GL/gl.h>              /* Header File For The OpenGL Library */
 #include <GL/glu.h>             /* Header File For The GLU Library */

diff --git a/include/begin_code.h b/include/begin_code.h
@@ -102,9 +102,6 @@
 #pragma nopackwarning
 #endif
 #pragma pack(push,4)
-#elif (defined(__MWERKS__) && defined(__MACOS__))
-#pragma options align=mac68k4byte
-#pragma enumsalwaysint on
 #endif /* Compiler needs structure packing set */
 
 /* Set up compiler-specific options for inlining functions */

diff --git a/include/close_code.h b/include/close_code.h
@@ -31,10 +31,5 @@
 #ifdef __BORLANDC__
 #pragma nopackwarning
 #endif
-#if (defined(__MWERKS__) && defined(__MACOS__))
-#pragma options align=reset
-#pragma enumsalwaysint reset
-#else
 #pragma pack(pop)
-#endif
 #endif /* Compiler needs structure packing set */
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
@@ -532,9 +532,6 @@ SDL_OpenAudio(SDL_AudioSpec * desired, SDL_AudioSpec * obtained)
         SDL_SetError("SDL_OpenAudio() passed a NULL callback");
         return (-1);
     }
-#if defined(__MACOS__) || (defined(__RISCOS__) && SDL_THREADS_DISABLED)
-    /* FIXME: Need to implement PPC interrupt asm for SDL_LockAudio() */
-#else
 #if defined(__MINT__) && SDL_THREADS_DISABLED
     /* Uses interrupt driven audio, without thread */
 #else
@@ -546,7 +543,6 @@ SDL_OpenAudio(SDL_AudioSpec * desired, SDL_AudioSpec * obtained)
         return (-1);
     }
 #endif /* __MINT__ */
-#endif /* __MACOS__ */
 
     /* Calculate the silence and size of the audio specification */
     SDL_CalculateAudioSpec(desired);

diff --git a/src/cdrom/SDL_cdrom.c b/src/cdrom/SDL_cdrom.c
@@ -26,9 +26,7 @@
 #include "SDL_cdrom.h"
 #include "SDL_syscdrom.h"
 
-#if !defined(__MACOS__)
 #define CLIP_FRAMES	10      /* Some CD-ROMs won't go all the way */
-#endif
 
 static int SDL_cdinitted = 0;
 static SDL_CD *default_cdrom;

diff --git a/src/cdrom/SDL_syscdrom.h b/src/cdrom/SDL_syscdrom.h
@@ -74,4 +74,5 @@ extern int SDL_SYS_CDInit(void);
 
 /* Function to perform any system-specific CD-ROM related cleanup */
 extern void SDL_SYS_CDQuit(void);
+
 /* vi: set ts=4 sw=4 expandtab: */