diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_os2.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_os2.h index 1579917e..f0564de1 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_os2.h +++ b/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_ */ diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h index 2af32360..9d1cb0a4 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h +++ b/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" diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 b/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 index 5a3fad3d..e4cdd2af 100755 Binary files a/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 and b/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 differ diff --git a/quakespasm/Windows/SDL2/include/SDL_config_os2.h b/quakespasm/Windows/SDL2/include/SDL_config_os2.h index 1579917e..f0564de1 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_os2.h +++ b/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_ */ diff --git a/quakespasm/Windows/SDL2/include/SDL_main.h b/quakespasm/Windows/SDL2/include/SDL_main.h index 2af32360..9d1cb0a4 100644 --- a/quakespasm/Windows/SDL2/include/SDL_main.h +++ b/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" diff --git a/quakespasm/Windows/SDL2/lib/SDL2.dll b/quakespasm/Windows/SDL2/lib/SDL2.dll index a1e53576..2ffb684c 100644 Binary files a/quakespasm/Windows/SDL2/lib/SDL2.dll and b/quakespasm/Windows/SDL2/lib/SDL2.dll differ diff --git a/quakespasm/Windows/SDL2/lib/SDL2.lib b/quakespasm/Windows/SDL2/lib/SDL2.lib index 57c945e1..6deda15b 100644 Binary files a/quakespasm/Windows/SDL2/lib/SDL2.lib and b/quakespasm/Windows/SDL2/lib/SDL2.lib differ diff --git a/quakespasm/Windows/SDL2/lib/SDL2main.lib b/quakespasm/Windows/SDL2/lib/SDL2main.lib index 14e9f75b..a4c97316 100644 Binary files a/quakespasm/Windows/SDL2/lib/SDL2main.lib and b/quakespasm/Windows/SDL2/lib/SDL2main.lib differ diff --git a/quakespasm/Windows/SDL2/lib/libSDL2.dll.a b/quakespasm/Windows/SDL2/lib/libSDL2.dll.a index 8c82e289..a41989ad 100644 Binary files a/quakespasm/Windows/SDL2/lib/libSDL2.dll.a and b/quakespasm/Windows/SDL2/lib/libSDL2.dll.a differ diff --git a/quakespasm/Windows/SDL2/lib/libSDL2main.a b/quakespasm/Windows/SDL2/lib/libSDL2main.a index 4c06d455..eb80e748 100644 Binary files a/quakespasm/Windows/SDL2/lib/libSDL2main.a and b/quakespasm/Windows/SDL2/lib/libSDL2main.a differ diff --git a/quakespasm/Windows/SDL2/lib64/SDL2.dll b/quakespasm/Windows/SDL2/lib64/SDL2.dll index f9c5ee57..281bde28 100644 Binary files a/quakespasm/Windows/SDL2/lib64/SDL2.dll and b/quakespasm/Windows/SDL2/lib64/SDL2.dll differ diff --git a/quakespasm/Windows/SDL2/lib64/SDL2.lib b/quakespasm/Windows/SDL2/lib64/SDL2.lib index d7fa235b..fe6f80a7 100644 Binary files a/quakespasm/Windows/SDL2/lib64/SDL2.lib and b/quakespasm/Windows/SDL2/lib64/SDL2.lib differ diff --git a/quakespasm/Windows/SDL2/lib64/SDL2main.lib b/quakespasm/Windows/SDL2/lib64/SDL2main.lib index d9344bb6..1bf7ec7d 100644 Binary files a/quakespasm/Windows/SDL2/lib64/SDL2main.lib and b/quakespasm/Windows/SDL2/lib64/SDL2main.lib differ diff --git a/quakespasm/Windows/SDL2/lib64/libSDL2.dll.a b/quakespasm/Windows/SDL2/lib64/libSDL2.dll.a index 8ec7ee51..e02db2ba 100644 Binary files a/quakespasm/Windows/SDL2/lib64/libSDL2.dll.a and b/quakespasm/Windows/SDL2/lib64/libSDL2.dll.a differ diff --git a/quakespasm/Windows/SDL2/lib64/libSDL2main.a b/quakespasm/Windows/SDL2/lib64/libSDL2main.a index e72450f5..584ce2ee 100644 Binary files a/quakespasm/Windows/SDL2/lib64/libSDL2main.a and b/quakespasm/Windows/SDL2/lib64/libSDL2main.a differ