SDL2: rebuilt for osx and windows after applying fixes for SDL bugs

3920, 3921, 3926, and 3739. (only the bug/3926 patch is in official
SDL repo, for now.)

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

quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_os2.h

@@ -25,9 +25,6 @@
 
 #include "SDL_platform.h"
 
-#define HAVE_STDARG_H   1
-#define HAVE_STDDEF_H   1
-
 #define SDL_AUDIO_DRIVER_DUMMY 1
 #define SDL_AUDIO_DRIVER_DISK 1
 #define SDL_AUDIO_DRIVER_OS2 1
@@ -50,14 +47,22 @@
 #define SDL_FILESYSTEM_OS2 1
 #define SDL_POWER_OS2 1
 
+/* Enable assembly routines */
+#define SDL_ASSEMBLY_ROUTINES 1
+
+/* #undef HAVE_LIBSAMPLERATE_H */
+
+/* Enable dynamic libsamplerate support */
+/* #undef SDL_LIBSAMPLERATE_DYNAMIC */
+
 #define HAVE_LIBC 1
 
-/* Useful headers */
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_STDIO_H 1
 #define STDC_HEADERS 1
 #define HAVE_STDLIB_H 1
 #define HAVE_STDARG_H 1
+#define HAVE_STDDEF_H 1
 #define HAVE_MALLOC_H 1
 #define HAVE_MEMORY_H 1
 #define HAVE_STRING_H 1
@@ -71,7 +76,6 @@
 #define HAVE_FLOAT_H 1
 #define HAVE_SIGNAL_H 1
 
-/* C library functions */
 #define HAVE_MALLOC 1
 #define HAVE_CALLOC 1
 #define HAVE_REALLOC 1
@@ -143,12 +147,4 @@
 #define HAVE_TAN 1
 #define HAVE_LOG 1
 
-/* #undef HAVE_LIBSAMPLERATE_H */
-
-/* Enable dynamic libsamplerate support */
-/* #undef SDL_LIBSAMPLERATE_DYNAMIC */
-
-/* Enable assembly routines */
-#define SDL_ASSEMBLY_ROUTINES 1
-
 #endif /* SDL_config_os2_h_ */

quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h

@@ -63,10 +63,13 @@
 /* On Android SDL provides a Java class in SDLActivity.java that is the
    main activity entry point.
 
-   See README-android.md for more details on extending that class.
+   See docs/README-android.md for more details on extending that class.
  */
 #define SDL_MAIN_NEEDED
 
+/* We need to export SDL_main so it can be launched from Java */
+#define SDLMAIN_DECLSPEC    DECLSPEC
+
 #elif defined(__NACL__)
 /* On NACL we use ppapi_simple to set up the application helper code,
    then wait for the first PSE_INSTANCE_DIDCHANGEVIEW event before 
@@ -85,6 +88,10 @@
 #define C_LINKAGE
 #endif /* __cplusplus */
 
+#ifndef SDLMAIN_DECLSPEC
+#define SDLMAIN_DECLSPEC
+#endif
+
 /**
  *  \file SDL_main.h
  *
@@ -107,7 +114,7 @@
 /**
  *  The prototype for the application's main() function
  */
-extern C_LINKAGE DECLSPEC int SDL_main(int argc, char *argv[]);
+extern C_LINKAGE SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[]);
 
 
 #include "begin_code.h"

quakespasm/Windows/SDL2/include/SDL_config_os2.h

@@ -25,9 +25,6 @@
 
 #include "SDL_platform.h"
 
-#define HAVE_STDARG_H   1
-#define HAVE_STDDEF_H   1
-
 #define SDL_AUDIO_DRIVER_DUMMY 1
 #define SDL_AUDIO_DRIVER_DISK 1
 #define SDL_AUDIO_DRIVER_OS2 1
@@ -50,14 +47,22 @@
 #define SDL_FILESYSTEM_OS2 1
 #define SDL_POWER_OS2 1
 
+/* Enable assembly routines */
+#define SDL_ASSEMBLY_ROUTINES 1
+
+/* #undef HAVE_LIBSAMPLERATE_H */
+
+/* Enable dynamic libsamplerate support */
+/* #undef SDL_LIBSAMPLERATE_DYNAMIC */
+
 #define HAVE_LIBC 1
 
-/* Useful headers */
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_STDIO_H 1
 #define STDC_HEADERS 1
 #define HAVE_STDLIB_H 1
 #define HAVE_STDARG_H 1
+#define HAVE_STDDEF_H 1
 #define HAVE_MALLOC_H 1
 #define HAVE_MEMORY_H 1
 #define HAVE_STRING_H 1
@@ -71,7 +76,6 @@
 #define HAVE_FLOAT_H 1
 #define HAVE_SIGNAL_H 1
 
-/* C library functions */
 #define HAVE_MALLOC 1
 #define HAVE_CALLOC 1
 #define HAVE_REALLOC 1
@@ -143,12 +147,4 @@
 #define HAVE_TAN 1
 #define HAVE_LOG 1
 
-/* #undef HAVE_LIBSAMPLERATE_H */
-
-/* Enable dynamic libsamplerate support */
-/* #undef SDL_LIBSAMPLERATE_DYNAMIC */
-
-/* Enable assembly routines */
-#define SDL_ASSEMBLY_ROUTINES 1
-
 #endif /* SDL_config_os2_h_ */

quakespasm/Windows/SDL2/include/SDL_main.h

@@ -63,10 +63,13 @@
 /* On Android SDL provides a Java class in SDLActivity.java that is the
    main activity entry point.
 
-   See README-android.md for more details on extending that class.
+   See docs/README-android.md for more details on extending that class.
  */
 #define SDL_MAIN_NEEDED
 
+/* We need to export SDL_main so it can be launched from Java */
+#define SDLMAIN_DECLSPEC    DECLSPEC
+
 #elif defined(__NACL__)
 /* On NACL we use ppapi_simple to set up the application helper code,
    then wait for the first PSE_INSTANCE_DIDCHANGEVIEW event before 
@@ -85,6 +88,10 @@
 #define C_LINKAGE
 #endif /* __cplusplus */
 
+#ifndef SDLMAIN_DECLSPEC
+#define SDLMAIN_DECLSPEC
+#endif
+
 /**
  *  \file SDL_main.h
  *
@@ -107,7 +114,7 @@
 /**
  *  The prototype for the application's main() function
  */
-extern C_LINKAGE DECLSPEC int SDL_main(int argc, char *argv[]);
+extern C_LINKAGE SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[]);
 
 
 #include "begin_code.h"