diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2009-01-11 20:24:24 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2009-01-11 20:24:24 +0000 |
| commit | 0a63b6ce56b7b7c540aeaded40594c3941c17b85 (patch) | |
| tree | f93458802501536d77402f0f34f03ab2a3780600 /package/sdl | |
| parent | 80a8ebc8ea6b31ba98f95cfd05ddc730720241a2 (diff) | |
Make sure SDL finds DirectFB headers ,if used
Diffstat (limited to 'package/sdl')
| -rw-r--r-- | package/sdl/sdl.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 22cb20135..6e8f2dd61 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -9,6 +9,8 @@ SDL_SITE:=http://www.libsdl.org/release SDL_CAT:=$(ZCAT) SDL_DIR:=$(BUILD_DIR)/SDL-$(SDL_VERSION) +SDL_EXTRA_CFLAGS = -I./include -D_GNU_SOURCE=1 -fvisibility=hidden -D_REENTRANT -D_REENTRANT -DHAVE_LINUX_VERSION_H + ifeq ($(BR2_PACKAGE_SDL_FBCON),y) SDL_FBCON=--enable-video-fbcon=yes else @@ -19,6 +21,7 @@ ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y) SDL_DIRECTFB=--enable-video-directfb=yes SDL_DIRECTFB_TARGET:=$(STAGING_DIR)/include/directfb SDL_DIRECTFB_INCLUDES:=-I$(STAGING_DIR)/usr/include/directfb +SDL_EXTRA_CFLAGS += $(SDL_DIRECTFB_INCLUDES) else SDL_DIRECTFB=--enable-video-directfb=no endif @@ -71,12 +74,13 @@ $(SDL_DIR)/.configured: $(SDL_DIR)/.unpacked ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y) $(SDL_DIRECTFB_TARGET): - ln -s ../usr/include/directfb $(STAGING_DIR)/include/directfb + mkdir -p $(STAGING_DIR)/include + ln -s ../usr/include/directfb $(SDL_DIRECTFB_TARGET) endif $(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(SDL_DIRECTFB_TARGET) $(MAKE1) $(TARGET_CONFIGURE_OPTS) \ - INCLUDE="-I./include $(SDL_DIRECTFB_INCLUDES)" \ + EXTRA_CFLAGS="$(SDL_EXTRA_CFLAGS)" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR) touch $@ @@ -94,6 +98,8 @@ $(TARGET_DIR)/usr/lib/libSDL.so: $(STAGING_DIR)/usr/lib/libSDL.so SDL sdl: uclibc $(TARGET_DIR)/usr/lib/libSDL.so +sdl-unpacked: $(SDL_DIR)/.unpacked + sdl-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SDL_DIR) uninstall -$(MAKE) -C $(SDL_DIR) clean |