From 4e59dce1028916bfe0f93b3ba884e5c80c270a06 Mon Sep 17 00:00:00 2001 From: meep-eep Date: Tue, 26 Apr 2005 22:37:10 +0000 Subject: [PATCH] Different version of SDL_INCLUDE. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1690 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/port.h | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/sc2/src/port.h b/sc2/src/port.h index c7d6a8a5f..aea93f0fd 100644 --- a/sc2/src/port.h +++ b/sc2/src/port.h @@ -147,25 +147,21 @@ iswgraph(wint_t wc) # define SDL_IMAGE_DIR SDL_image #else // SDL_image.h directly under the include dir. -# define SDL_DIR -# define SDL_IMAGE_DIR +# undef SDL_DIR +# undef SDL_IMAGE_DIR #endif -#define xSDL_DIR x##SDL_DIR -#if xSDL_DIR == x -# define SDL_INCLUDE(file) -#else +#ifdef SDL_DIR # define SDL_INCLUDE(file) -#endif -#undef xSDL_DIR - -#define xSDL_IMAGE_DIR x##SDL_IMAGE_DIR -#if xSDL_IMAGE_DIR == x -# define SDL_IMAGE_INCLUDE(file) #else +# define SDL_INCLUDE(file) +#endif /* SDL_DIR */ + +#ifdef SDL_IMAGE_DIR # define SDL_IMAGE_INCLUDE(file) -#endif -#undef xSDL_IMAGE_DIR +#else +# define SDL_IMAGE_INCLUDE(file) +#endif /* SDL_IMAGE_DIR */ #endif /* _PORT_H */