encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix enabling SDL_DYNAMIC_API in OpenWatcom builds

This commit is contained in:
Cameron Cawley 2022-05-19 16:58:11 +01:00 committed by Ozkan Sezer
parent 3d52d04977
commit f0566702c5
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/SDL_internal.h
View File

@ -43,10 +43,9 @@
#if SDL_DYNAMIC_API #if SDL_DYNAMIC_API
#include "dynapi/SDL_dynapi_overrides.h" #include "dynapi/SDL_dynapi_overrides.h"
/* force DECLSPEC and SDLCALL off...it's all internal symbols now. /* force DECLSPEC off...it's all internal symbols now.
These will have actual #defines during SDL_dynapi.c only */ These will have actual #defines during SDL_dynapi.c only */
#define DECLSPEC #define DECLSPEC
#define SDLCALL
#endif #endif
#include "SDL_config.h" #include "SDL_config.h"

1
src/dynapi/SDL2.exports
View File

@ -1,5 +1,6 @@
# Windows exports file for Watcom # Windows exports file for Watcom
# DO NOT EDIT THIS FILE BY HAND. It is autogenerated by gendynapi.pl. # DO NOT EDIT THIS FILE BY HAND. It is autogenerated by gendynapi.pl.
++'_SDL_DYNAPI_entry'.'SDL2.dll'.'SDL_DYNAPI_entry'
++'_SDL_SetError'.'SDL2.dll'.'SDL_SetError' ++'_SDL_SetError'.'SDL2.dll'.'SDL_SetError'
++'_SDL_Log'.'SDL2.dll'.'SDL_Log' ++'_SDL_Log'.'SDL2.dll'.'SDL_Log'
++'_SDL_LogVerbose'.'SDL2.dll'.'SDL_LogVerbose' ++'_SDL_LogVerbose'.'SDL2.dll'.'SDL_LogVerbose'

2
src/dynapi/SDL_dynapi.h
View File

@ -61,8 +61,6 @@
#define SDL_DYNAMIC_API 0 /* vitasdk doesn't support dynamic linking */ #define SDL_DYNAMIC_API 0 /* vitasdk doesn't support dynamic linking */
#elif defined(__NGAGE__) #elif defined(__NGAGE__)
#define SDL_DYNAMIC_API 0 /* The N-Gage doesn't support dynamic linking either */ #define SDL_DYNAMIC_API 0 /* The N-Gage doesn't support dynamic linking either */
#elif defined(__OS2__) || defined(__WATCOMC__)
#define SDL_DYNAMIC_API 0 /* see github bugs #5667 and #5669 */
#elif defined(DYNAPI_NEEDS_DLOPEN) && !defined(HAVE_DLOPEN) #elif defined(DYNAPI_NEEDS_DLOPEN) && !defined(HAVE_DLOPEN)
#define SDL_DYNAMIC_API 0 /* we need dlopen(), but don't have it.... */ #define SDL_DYNAMIC_API 0 /* we need dlopen(), but don't have it.... */
#endif #endif