From 50ea94478903add8135d4de8e6cf6c4c21f3440b Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Sun, 9 Nov 2014 19:42:26 +0100 Subject: [PATCH] libports/sdl_image: enable XPM, add include/SDL Some SDL applications expect the SDL_image headers in include/SDL to be reachable without the SDL/ prefix. This patch adds the corresponding search path. Furthermore it enables support for XPM images. --- repos/libports/lib/import/import-sdl_image.mk | 3 ++- repos/libports/lib/mk/sdl_image.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/repos/libports/lib/import/import-sdl_image.mk b/repos/libports/lib/import/import-sdl_image.mk index 62d8c9585..de527554a 100644 --- a/repos/libports/lib/import/import-sdl_image.mk +++ b/repos/libports/lib/import/import-sdl_image.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,sdl_image)/include +INC_DIR += $(call select_from_ports,sdl_image)/include \ + $(call select_from_ports,sdl_image)/include/SDL diff --git a/repos/libports/lib/mk/sdl_image.mk b/repos/libports/lib/mk/sdl_image.mk index d7d8d229e..41c4435e8 100644 --- a/repos/libports/lib/mk/sdl_image.mk +++ b/repos/libports/lib/mk/sdl_image.mk @@ -4,7 +4,7 @@ SRC_C = $(notdir $(wildcard $(SDL_IMAGE_PORT_DIR)/src/lib/sdl_image/IMG*.c)) LIBS += libc libm sdl jpeg libpng zlib -SUPPORTED_FORMATS = PNG JPG TGA PNM +SUPPORTED_FORMATS = PNG JPG TGA PNM XPM CC_OPT += $(addprefix -DLOAD_,$(SUPPORTED_FORMATS))