oslibs: rebuilt SDL1.2

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1497 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2017-09-11 11:22:13 +00:00
parent 63ee3643ae
commit 61deae5b67
18 changed files with 32 additions and 74 deletions

View file

@ -27,17 +27,6 @@
/* This is a set of defines to configure the SDL features */ /* This is a set of defines to configure the SDL features */
typedef signed char int8_t;
typedef unsigned char uint8_t;
typedef signed short int16_t;
typedef unsigned short uint16_t;
typedef signed int int32_t;
typedef unsigned int uint32_t;
typedef unsigned int size_t;
typedef unsigned long uintptr_t;
typedef signed long long int64_t;
typedef unsigned long long uint64_t;
#define SDL_HAS_64BIT_TYPE 1 #define SDL_HAS_64BIT_TYPE 1
/* Use Watcom's LIBC */ /* Use Watcom's LIBC */
@ -67,7 +56,6 @@ typedef unsigned long long uint64_t;
#define HAVE_ALLOCA 1 #define HAVE_ALLOCA 1
#define HAVE_GETENV 1 #define HAVE_GETENV 1
#define HAVE_PUTENV 1 #define HAVE_PUTENV 1
/* #undef HAVE_UNSETENV */
#define HAVE_QSORT 1 #define HAVE_QSORT 1
#define HAVE_ABS 1 #define HAVE_ABS 1
#define HAVE_BCOPY 1 #define HAVE_BCOPY 1
@ -89,7 +77,6 @@ typedef unsigned long long uint64_t;
#define HAVE_STRSTR 1 #define HAVE_STRSTR 1
#define HAVE_ITOA 1 #define HAVE_ITOA 1
#define HAVE__LTOA 1 #define HAVE__LTOA 1
#define HAVE__UITOA 1
#define HAVE__ULTOA 1 #define HAVE__ULTOA 1
#define HAVE_STRTOL 1 #define HAVE_STRTOL 1
#define HAVE_STRTOUL 1 #define HAVE_STRTOUL 1
@ -135,7 +122,7 @@ typedef unsigned long long uint64_t;
#define SDL_VIDEO_DRIVER_OS2FS 1 #define SDL_VIDEO_DRIVER_OS2FS 1
/* Enable OpenGL support */ /* Enable OpenGL support */
/* Nothing here yet for OS/2... :( */ /* Nothing yet for OS/2. */
/* Enable assembly routines where available */ /* Enable assembly routines where available */
#define SDL_ASSEMBLY_ROUTINES 1 #define SDL_ASSEMBLY_ROUTINES 1

View file

@ -96,6 +96,7 @@ typedef unsigned int uintptr_t;
#define HAVE_MEMMOVE 1 #define HAVE_MEMMOVE 1
#define HAVE_MEMCMP 1 #define HAVE_MEMCMP 1
#define HAVE_STRLEN 1 #define HAVE_STRLEN 1
#define HAVE_STRDUP 1
#define HAVE__STRREV 1 #define HAVE__STRREV 1
#define HAVE__STRUPR 1 #define HAVE__STRUPR 1
#define HAVE__STRLWR 1 #define HAVE__STRLWR 1
@ -105,9 +106,14 @@ typedef unsigned int uintptr_t;
#define HAVE_ITOA 1 #define HAVE_ITOA 1
#define HAVE__LTOA 1 #define HAVE__LTOA 1
#define HAVE__ULTOA 1 #define HAVE__ULTOA 1
#define HAVE__I64TOA 1
#define HAVE__UI64TOA 1
#define HAVE_STRTOL 1 #define HAVE_STRTOL 1
#define HAVE_STRTOUL 1 #define HAVE_STRTOUL 1
#if defined(__MINGW32__) || defined(__WATCOMC__)
#define HAVE_STRTOLL 1 #define HAVE_STRTOLL 1
#define HAVE_STRTOULL 1
#endif
#define HAVE_STRTOD 1 #define HAVE_STRTOD 1
#define HAVE_ATOI 1 #define HAVE_ATOI 1
#define HAVE_ATOF 1 #define HAVE_ATOF 1

View file

@ -82,7 +82,7 @@
#undef __OPENBSD__ #undef __OPENBSD__
#define __OPENBSD__ 1 #define __OPENBSD__ 1
#endif #endif
#if defined(__OS2__) #if defined(__OS2__) || defined(__EMX__)
#undef __OS2__ #undef __OS2__
#define __OS2__ 1 #define __OS2__ 1
#endif #endif

View file

@ -58,24 +58,11 @@
# define DECLSPEC __declspec(dllexport) # define DECLSPEC __declspec(dllexport)
# endif # endif
# elif defined(__OS2__) # elif defined(__OS2__)
# ifdef __WATCOMC__
# ifdef BUILD_SDL # ifdef BUILD_SDL
# define DECLSPEC __declspec(dllexport) # define DECLSPEC __declspec(dllexport)
# else # else
# define DECLSPEC # define DECLSPEC
# endif # endif
# elif defined (__GNUC__) && __GNUC__ < 4
# /* Added support for GCC-EMX <v4.x */
# /* this is needed for XFree86/OS2 developement */
# /* F. Ambacher(anakor@snafu.de) 05.2008 */
# ifdef BUILD_SDL
# define DECLSPEC __declspec(dllexport)
# else
# define DECLSPEC
# endif
# else
# define DECLSPEC
# endif
# else # else
# if defined(__GNUC__) && __GNUC__ >= 4 # if defined(__GNUC__) && __GNUC__ >= 4
# define DECLSPEC __attribute__ ((visibility("default"))) # define DECLSPEC __attribute__ ((visibility("default")))
@ -93,16 +80,12 @@
# if defined(__WIN32__) && !defined(__GNUC__) # if defined(__WIN32__) && !defined(__GNUC__)
# define SDLCALL __cdecl # define SDLCALL __cdecl
# elif defined(__OS2__) # elif defined(__OS2__)
# if defined (__GNUC__) && __GNUC__ < 4 /* But on OS/2, we use the _System calling convention */
# /* Added support for GCC-EMX <v4.x */ /* to be compatible with every compiler */
# /* this is needed for XFree86/OS2 developement */ # if defined (__GNUC__) && !defined(_System)
# /* F. Ambacher(anakor@snafu.de) 05.2008 */ # define _System /* For compatibility with old GCC/EMX */
# define SDLCALL _cdecl
# else
# /* On other compilers on OS/2, we use the _System calling convention */
# /* to be compatible with every compiler */
# define SDLCALL _System
# endif # endif
# define SDLCALL _System
# else # else
# define SDLCALL # define SDLCALL
# endif # endif

Binary file not shown.

View file

@ -27,17 +27,6 @@
/* This is a set of defines to configure the SDL features */ /* This is a set of defines to configure the SDL features */
typedef signed char int8_t;
typedef unsigned char uint8_t;
typedef signed short int16_t;
typedef unsigned short uint16_t;
typedef signed int int32_t;
typedef unsigned int uint32_t;
typedef unsigned int size_t;
typedef unsigned long uintptr_t;
typedef signed long long int64_t;
typedef unsigned long long uint64_t;
#define SDL_HAS_64BIT_TYPE 1 #define SDL_HAS_64BIT_TYPE 1
/* Use Watcom's LIBC */ /* Use Watcom's LIBC */
@ -67,7 +56,6 @@ typedef unsigned long long uint64_t;
#define HAVE_ALLOCA 1 #define HAVE_ALLOCA 1
#define HAVE_GETENV 1 #define HAVE_GETENV 1
#define HAVE_PUTENV 1 #define HAVE_PUTENV 1
/* #undef HAVE_UNSETENV */
#define HAVE_QSORT 1 #define HAVE_QSORT 1
#define HAVE_ABS 1 #define HAVE_ABS 1
#define HAVE_BCOPY 1 #define HAVE_BCOPY 1
@ -89,7 +77,6 @@ typedef unsigned long long uint64_t;
#define HAVE_STRSTR 1 #define HAVE_STRSTR 1
#define HAVE_ITOA 1 #define HAVE_ITOA 1
#define HAVE__LTOA 1 #define HAVE__LTOA 1
#define HAVE__UITOA 1
#define HAVE__ULTOA 1 #define HAVE__ULTOA 1
#define HAVE_STRTOL 1 #define HAVE_STRTOL 1
#define HAVE_STRTOUL 1 #define HAVE_STRTOUL 1
@ -135,7 +122,7 @@ typedef unsigned long long uint64_t;
#define SDL_VIDEO_DRIVER_OS2FS 1 #define SDL_VIDEO_DRIVER_OS2FS 1
/* Enable OpenGL support */ /* Enable OpenGL support */
/* Nothing here yet for OS/2... :( */ /* Nothing yet for OS/2. */
/* Enable assembly routines where available */ /* Enable assembly routines where available */
#define SDL_ASSEMBLY_ROUTINES 1 #define SDL_ASSEMBLY_ROUTINES 1

View file

@ -96,6 +96,7 @@ typedef unsigned int uintptr_t;
#define HAVE_MEMMOVE 1 #define HAVE_MEMMOVE 1
#define HAVE_MEMCMP 1 #define HAVE_MEMCMP 1
#define HAVE_STRLEN 1 #define HAVE_STRLEN 1
#define HAVE_STRDUP 1
#define HAVE__STRREV 1 #define HAVE__STRREV 1
#define HAVE__STRUPR 1 #define HAVE__STRUPR 1
#define HAVE__STRLWR 1 #define HAVE__STRLWR 1
@ -105,9 +106,14 @@ typedef unsigned int uintptr_t;
#define HAVE_ITOA 1 #define HAVE_ITOA 1
#define HAVE__LTOA 1 #define HAVE__LTOA 1
#define HAVE__ULTOA 1 #define HAVE__ULTOA 1
#define HAVE__I64TOA 1
#define HAVE__UI64TOA 1
#define HAVE_STRTOL 1 #define HAVE_STRTOL 1
#define HAVE_STRTOUL 1 #define HAVE_STRTOUL 1
#if defined(__MINGW32__) || defined(__WATCOMC__)
#define HAVE_STRTOLL 1 #define HAVE_STRTOLL 1
#define HAVE_STRTOULL 1
#endif
#define HAVE_STRTOD 1 #define HAVE_STRTOD 1
#define HAVE_ATOI 1 #define HAVE_ATOI 1
#define HAVE_ATOF 1 #define HAVE_ATOF 1

View file

@ -82,7 +82,7 @@
#undef __OPENBSD__ #undef __OPENBSD__
#define __OPENBSD__ 1 #define __OPENBSD__ 1
#endif #endif
#if defined(__OS2__) #if defined(__OS2__) || defined(__EMX__)
#undef __OS2__ #undef __OS2__
#define __OS2__ 1 #define __OS2__ 1
#endif #endif

View file

@ -58,24 +58,11 @@
# define DECLSPEC __declspec(dllexport) # define DECLSPEC __declspec(dllexport)
# endif # endif
# elif defined(__OS2__) # elif defined(__OS2__)
# ifdef __WATCOMC__
# ifdef BUILD_SDL # ifdef BUILD_SDL
# define DECLSPEC __declspec(dllexport) # define DECLSPEC __declspec(dllexport)
# else # else
# define DECLSPEC # define DECLSPEC
# endif # endif
# elif defined (__GNUC__) && __GNUC__ < 4
# /* Added support for GCC-EMX <v4.x */
# /* this is needed for XFree86/OS2 developement */
# /* F. Ambacher(anakor@snafu.de) 05.2008 */
# ifdef BUILD_SDL
# define DECLSPEC __declspec(dllexport)
# else
# define DECLSPEC
# endif
# else
# define DECLSPEC
# endif
# else # else
# if defined(__GNUC__) && __GNUC__ >= 4 # if defined(__GNUC__) && __GNUC__ >= 4
# define DECLSPEC __attribute__ ((visibility("default"))) # define DECLSPEC __attribute__ ((visibility("default")))
@ -93,16 +80,12 @@
# if defined(__WIN32__) && !defined(__GNUC__) # if defined(__WIN32__) && !defined(__GNUC__)
# define SDLCALL __cdecl # define SDLCALL __cdecl
# elif defined(__OS2__) # elif defined(__OS2__)
# if defined (__GNUC__) && __GNUC__ < 4 /* But on OS/2, we use the _System calling convention */
# /* Added support for GCC-EMX <v4.x */ /* to be compatible with every compiler */
# /* this is needed for XFree86/OS2 developement */ # if defined (__GNUC__) && !defined(_System)
# /* F. Ambacher(anakor@snafu.de) 05.2008 */ # define _System /* For compatibility with old GCC/EMX */
# define SDLCALL _cdecl
# else
# /* On other compilers on OS/2, we use the _System calling convention */
# /* to be compatible with every compiler */
# define SDLCALL _System
# endif # endif
# define SDLCALL _System
# else # else
# define SDLCALL # define SDLCALL
# endif # endif

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -199,7 +199,10 @@ SDL_iconv_string
SDL_mutexP SDL_mutexP
SDL_mutexV SDL_mutexV
SDL_putenv SDL_putenv
SDL_revcpy
SDL_snprintf SDL_snprintf
SDL_strlcat SDL_strlcat
SDL_strlcpy SDL_strlcpy
SDL_strtoll
SDL_strtoull
SDL_vsnprintf SDL_vsnprintf

View file

@ -196,7 +196,10 @@
++'_SDL_mutexP'.'SDL.DLL'..'SDL_mutexP' ++'_SDL_mutexP'.'SDL.DLL'..'SDL_mutexP'
++'_SDL_mutexV'.'SDL.DLL'..'SDL_mutexV' ++'_SDL_mutexV'.'SDL.DLL'..'SDL_mutexV'
++'_SDL_putenv'.'SDL.DLL'..'SDL_putenv' ++'_SDL_putenv'.'SDL.DLL'..'SDL_putenv'
++'_SDL_revcpy'.'SDL.DLL'..'SDL_revcpy'
++'_SDL_snprintf'.'SDL.DLL'..'SDL_snprintf' ++'_SDL_snprintf'.'SDL.DLL'..'SDL_snprintf'
++'_SDL_strlcat'.'SDL.DLL'..'SDL_strlcat' ++'_SDL_strlcat'.'SDL.DLL'..'SDL_strlcat'
++'_SDL_strlcpy'.'SDL.DLL'..'SDL_strlcpy' ++'_SDL_strlcpy'.'SDL.DLL'..'SDL_strlcpy'
++'_SDL_strtoll'.'SDL.DLL'..'SDL_strtoll'
++'_SDL_strtoull'.'SDL.DLL'..'SDL_strtoull'
++'_SDL_vsnprintf'.'SDL.DLL'..'SDL_vsnprintf' ++'_SDL_vsnprintf'.'SDL.DLL'..'SDL_vsnprintf'

Binary file not shown.