From 79670de4d78c6b6cd1e449aad985ac8dc4438b4e Mon Sep 17 00:00:00 2001 From: /dev/humancontroller Date: Thu, 18 Jun 2015 14:16:53 +0200 Subject: use system libraries more properly; introduce a dependency on Minizip remove the USE_LOCAL_HEADERS option (it was broken anyway) --- src/sys/sys_loadlib.h | 9 ++------- src/sys/sys_main.c | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) (limited to 'src/sys') diff --git a/src/sys/sys_loadlib.h b/src/sys/sys_loadlib.h index 98d96935..c6b63419 100644 --- a/src/sys/sys_loadlib.h +++ b/src/sys/sys_loadlib.h @@ -36,13 +36,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # define Sys_LibraryError() dlerror() # endif #else -# ifdef USE_LOCAL_HEADERS -# include "SDL.h" -# include "SDL_loadso.h" -# else -# include -# include -# endif +# include +# include # define Sys_LoadLibrary(f) SDL_LoadObject(f) # define Sys_UnloadLibrary(h) SDL_UnloadObject(h) # define Sys_LoadFunction(h,fn) SDL_LoadFunction(h,fn) diff --git a/src/sys/sys_main.c b/src/sys/sys_main.c index 34367ce4..fbb0c5b4 100644 --- a/src/sys/sys_main.c +++ b/src/sys/sys_main.c @@ -33,13 +33,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #ifndef DEDICATED -#ifdef USE_LOCAL_HEADERS -# include "SDL.h" -# include "SDL_cpuinfo.h" -#else -# include -# include -#endif +#include +#include #endif #include "sys_local.h" -- cgit