Remove the last vestige of the internal SDL_IMAGE macros

This commit is contained in:
Michael Martin
2019-08-10 15:41:11 -07:00
parent 3e6f9cf5b1
commit 65f5b27f8d
2 changed files with 1 additions and 12 deletions
-1
View File
@@ -22,7 +22,6 @@
#include "port.h" #include "port.h"
#include SDL_INCLUDE(SDL.h) #include SDL_INCLUDE(SDL.h)
#include SDL_INCLUDE(SDL_byteorder.h) #include SDL_INCLUDE(SDL_byteorder.h)
#include SDL_IMAGE_INCLUDE(SDL_image.h)
#include "../gfxintrn.h" #include "../gfxintrn.h"
#include "libs/graphics/tfb_draw.h" #include "libs/graphics/tfb_draw.h"
+1 -11
View File
@@ -460,18 +460,14 @@ typedef unsigned int wint_t;
# endif /* defined (__FreeBSD__) || defined (__OpenBSD__) */ # endif /* defined (__FreeBSD__) || defined (__OpenBSD__) */
#endif /* defined (PORT_WANT_ERRNO) */ #endif /* defined (PORT_WANT_ERRNO) */
// Use SDL_INCLUDE and SDL_IMAGE_INCLUDE to portably include the SDL files // Use SDL_INCLUDE to portably include the SDL files from the right location.
// from the right location.
// TODO: Where the SDL and SDL_image headers are located could be detected // TODO: Where the SDL and SDL_image headers are located could be detected
// from the build script. // from the build script.
#ifdef __APPLE__ #ifdef __APPLE__
// SDL_image.h in a directory SDL_image under the include dir.
# define SDL_DIR SDL # define SDL_DIR SDL
# define SDL_IMAGE_DIR SDL_image
#else #else
// SDL_image.h directly under the include dir. // SDL_image.h directly under the include dir.
# undef SDL_DIR # undef SDL_DIR
# undef SDL_IMAGE_DIR
#endif #endif
#ifdef SDL_DIR #ifdef SDL_DIR
@@ -480,12 +476,6 @@ typedef unsigned int wint_t;
# define SDL_INCLUDE(file) <file> # define SDL_INCLUDE(file) <file>
#endif /* SDL_DIR */ #endif /* SDL_DIR */
#ifdef SDL_IMAGE_DIR
# define SDL_IMAGE_INCLUDE(file) <SDL_IMAGE_DIR/file>
#else
# define SDL_IMAGE_INCLUDE(file) <file>
#endif /* SDL_IMAGE_DIR */
// Mark a function as using printf-style function arguments, so that // Mark a function as using printf-style function arguments, so that
// extra consistency checks can be made by the compiler. // extra consistency checks can be made by the compiler.
// The first argument to PRINTF_FUNCTION and VPRINTF_FUNCTION is the // The first argument to PRINTF_FUNCTION and VPRINTF_FUNCTION is the