SDL2: rebuilt after applying fixes for SDL bugs 3051, 3814, 3842, 3847, 3852, 3854.

- Windows version is now built using VS2013-update5 with the WinXP option.
- SDL-2.0.6 bugs #3845, 3846, 3848, 3849, and 3851 are still not resolved.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1513 af15c1b1-3010-417e-b628-4374ebc0bcbd

MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_windows.h

@@ -166,7 +166,7 @@ typedef unsigned int uintptr_t;
 /* Enable various audio drivers */
 /* #undef SDL_AUDIO_DRIVER_WASAPI */
 #define SDL_AUDIO_DRIVER_DSOUND 1
-#define SDL_AUDIO_DRIVER_XAUDIO2    0
+/* #undef SDL_AUDIO_DRIVER_XAUDIO2 */
 #define SDL_AUDIO_DRIVER_WINMM  1
 #define SDL_AUDIO_DRIVER_DISK   1
 #define SDL_AUDIO_DRIVER_DUMMY  1

MacOSX/SDL2.framework/Versions/A/Headers/SDL_thread.h

@@ -90,14 +90,11 @@ typedef int (SDLCALL * SDL_ThreadFunction) (void *data);
  *  library!
  */
 #define SDL_PASSED_BEGINTHREAD_ENDTHREAD
-#include <process.h>            /* This has _beginthread() and _endthread() defined! */
+#include <process.h> /* _beginthreadex() and _endthreadex() */
 
-typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned,
+typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread)
-                                                        unsigned (__stdcall *
+                   (void *, unsigned, unsigned (__stdcall *func)(void *),
-                                                                  func) (void
+                    void * /*arg*/, unsigned, unsigned * /* threadID */);
-                                                                         *),
-                                                        void *arg, unsigned,
-                                                        unsigned *threadID);
 typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code);
 
 /**
@@ -124,7 +121,11 @@ SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data,
  * into a dll with Watcom's runtime statically linked.
  */
 #define SDL_PASSED_BEGINTHREAD_ENDTHREAD
+#ifndef __EMX__
 #include <process.h>
+#else
+#include <stdlib.h>
+#endif
 typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void * /*arg*/);
 typedef void (*pfnSDL_CurrentEndThread)(void);
 extern DECLSPEC SDL_Thread *SDLCALL

Windows/SDL2/include/SDL_config_windows.h

@@ -166,7 +166,7 @@ typedef unsigned int uintptr_t;
 /* Enable various audio drivers */
 /* #undef SDL_AUDIO_DRIVER_WASAPI */
 #define SDL_AUDIO_DRIVER_DSOUND 1
-#define SDL_AUDIO_DRIVER_XAUDIO2    0
+/* #undef SDL_AUDIO_DRIVER_XAUDIO2 */
 #define SDL_AUDIO_DRIVER_WINMM  1
 #define SDL_AUDIO_DRIVER_DISK   1
 #define SDL_AUDIO_DRIVER_DUMMY  1

Windows/SDL2/include/SDL_thread.h

@@ -90,14 +90,11 @@ typedef int (SDLCALL * SDL_ThreadFunction) (void *data);
  *  library!
  */
 #define SDL_PASSED_BEGINTHREAD_ENDTHREAD
-#include <process.h>            /* This has _beginthread() and _endthread() defined! */
+#include <process.h> /* _beginthreadex() and _endthreadex() */
 
-typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned,
+typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread)
-                                                        unsigned (__stdcall *
+                   (void *, unsigned, unsigned (__stdcall *func)(void *),
-                                                                  func) (void
+                    void * /*arg*/, unsigned, unsigned * /* threadID */);
-                                                                         *),
-                                                        void *arg, unsigned,
-                                                        unsigned *threadID);
 typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code);
 
 /**
@@ -124,7 +121,11 @@ SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data,
  * into a dll with Watcom's runtime statically linked.
  */
 #define SDL_PASSED_BEGINTHREAD_ENDTHREAD
+#ifndef __EMX__
 #include <process.h>
+#else
+#include <stdlib.h>
+#endif
 typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void * /*arg*/);
 typedef void (*pfnSDL_CurrentEndThread)(void);
 extern DECLSPEC SDL_Thread *SDLCALL

Windows/SDL2/watcom/makefile

@@ -1,4 +1,4 @@
-# Open Watcom makefile to generate SDL.lib
+# Open Watcom makefile to generate SDL2.lib
 # def2lbc.awk (from OW source tree) requires 'awk'
 # run 'wmake'