Merge changes I505c4aea,I2ae0529c

* changes:
  Import SDL release-1.2.15
  Handle SDL windows with BGRA color

1 files changed, 41 insertions, 0 deletions

diff --git a/distrib/sdl-1.2.15/src/cdrom/dummy/SDL_syscdrom.c b/distrib/sdl-1.2.15/src/cdrom/dummy/SDL_syscdrom.c
new file mode 100644
index 0000000..9821e97
--- /dev/null
+++ b/distrib/sdl-1.2.15/src/cdrom/dummy/SDL_syscdrom.c
@@ -0,0 +1,41 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2012 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 St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#if defined(SDL_CDROM_DUMMY) || defined(SDL_CDROM_DISABLED)
+
+/* Stub functions for system-level CD-ROM audio control */
+
+#include "SDL_cdrom.h"
+#include "../SDL_syscdrom.h"
+
+int  SDL_SYS_CDInit(void)
+{
+	return(0);
+}
+
+void SDL_SYS_CDQuit(void)
+{
+	return;
+}
+
+#endif /* SDL_CDROM_DUMMY || SDL_CDROM_DISABLED */