Use SDL2.framework from /Library/Frameworks on OS X instead of miniSDL.

Remove SDL code on OS X's plug-ins subdirectory.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86848 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 0 insertions, 168 deletions

diff --git a/macosx/plugins/Common/SDL/src/SDL.c b/macosx/plugins/Common/SDL/src/SDL.c
deleted file mode 100644
index 005fb245..00000000
--- a/macosx/plugins/Common/SDL/src/SDL.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#include "SDL_config.h"
-
-#include <time.h>
-#include <errno.h>
-
-/* Initialization code for SDL */
-
-#include "SDL.h"
-#include "haptic/SDL_haptic_c.h"
-#include "joystick/SDL_joystick_c.h"
-
-/* The initialized subsystems */
-static Uint32 SDL_initialized = 0;
-
-int
-SDL_InitSubSystem(Uint32 flags)
-{
-#ifndef SDL_JOYSTICK_DISABLED
-    /* Initialize the joystick subsystem */
-    if ((flags & SDL_INIT_JOYSTICK) && !(SDL_initialized & SDL_INIT_JOYSTICK)) {
-        if (SDL_JoystickInit() < 0) {
-            return (-1);
-        }
-        SDL_initialized |= SDL_INIT_JOYSTICK;
-    }
-
-    /* Initialize the haptic subsystem */
-    if ((flags & SDL_INIT_HAPTIC) && !(SDL_initialized & SDL_INIT_HAPTIC)) {
-        if (SDL_HapticInit() < 0) {
-            return (-1);
-        }
-        SDL_initialized |= SDL_INIT_HAPTIC;
-    }
-#endif
-
-#ifndef SDL_AUDIO_DISABLED
-    /* Initialize the audio subsystem */
-    if ((flags & SDL_INIT_AUDIO) && !(SDL_initialized & SDL_INIT_AUDIO)) {
-        if (SDL_AudioInit(NULL) < 0) {
-            return (-1);
-        }
-        SDL_initialized |= SDL_INIT_AUDIO;
-    }
-#endif
-
-    return (0);
-}
-
-int
-SDL_Init(Uint32 flags)
-{
-    /* Clear the error message */
-    SDL_ClearError();
-
-    /* Initialize the desired subsystems */
-    if (SDL_InitSubSystem(flags) < 0) {
-        return (-1);
-    }
-
-    return (0);
-}
-
-void
-SDL_QuitSubSystem(Uint32 flags)
-{
-#ifndef SDL_JOYSTICK_DISABLED
-    /* Shut down requested initialized subsystems */
-    if ((flags & SDL_initialized & SDL_INIT_JOYSTICK)) {
-        SDL_JoystickQuit();
-        SDL_initialized &= ~SDL_INIT_JOYSTICK;
-    }
-
-    if ((flags & SDL_initialized & SDL_INIT_HAPTIC)) {
-        SDL_HapticQuit();
-        SDL_initialized &= ~SDL_INIT_HAPTIC;
-    }
-#endif
-
-#ifndef SDL_AUDIO_DISABLED
-    if ((flags & SDL_initialized & SDL_INIT_AUDIO)) {
-        SDL_AudioQuit();
-        SDL_initialized &= ~SDL_INIT_AUDIO;
-    }
-#endif
-}
-
-Uint32
-SDL_WasInit(Uint32 flags)
-{
-    if (!flags) {
-        flags = SDL_INIT_EVERYTHING;
-    }
-    return (SDL_initialized & flags);
-}
-
-void
-SDL_Quit(void)
-{
-    /* Quit all subsystems */
-    SDL_QuitSubSystem(SDL_INIT_EVERYTHING);
-}
-
-
-void
-SDL_Delay(Uint32 ms)
-{
-    int was_error;
-
-#if HAVE_NANOSLEEP
-    struct timespec elapsed, tv;
-#else
-    struct timeval tv;
-    Uint32 then, now, elapsed;
-#endif
-
-    /* Set the timeout interval */
-#if HAVE_NANOSLEEP
-    elapsed.tv_sec = ms / 1000;
-    elapsed.tv_nsec = (ms % 1000) * 1000000;
-#else
-    then = SDL_GetTicks();
-#endif
-    do {
-        errno = 0;
-
-#if HAVE_NANOSLEEP
-        tv.tv_sec = elapsed.tv_sec;
-        tv.tv_nsec = elapsed.tv_nsec;
-        was_error = nanosleep(&tv, &elapsed);
-#else
-        /* Calculate the time interval left (in case of interrupt) */
-        now = SDL_GetTicks();
-        elapsed = (now - then);
-        then = now;
-        if (elapsed >= ms) {
-            break;
-        }
-        ms -= elapsed;
-        tv.tv_sec = ms / 1000;
-        tv.tv_usec = (ms % 1000) * 1000;
-
-        was_error = select(0, NULL, NULL, NULL, &tv);
-#endif /* HAVE_NANOSLEEP */
-    } while (was_error && (errno == EINTR));
-}
-