libsdl-*: use ICONV notation

This commit is contained in:
kyak 2011-02-06 22:12:06 +03:00
parent c43d20fe43
commit 4abe594a4f
3 changed files with 8 additions and 7 deletions

View File

@ -17,6 +17,7 @@ PKG_MD5SUM:=8a787e538a8e4d80d4927535be5af083
PKG_BUILD_DIR:=$(BUILD_DIR)/SDL_gfx-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/libsdl-gfx
SECTION:=libs
@ -33,7 +34,7 @@ endef
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/SDL
CONFIGURE_VARS += \
LIBS="-lSDL -ldirect -ldirectfb -lfusion -liconv"
LIBS="-lSDL -ldirect -ldirectfb -lfusion"
define Build/Configure
$(call Build/Configure/Default, \

View File

@ -19,6 +19,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/SDL_image-$(PKG_VERSION)
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/libsdl-image
SECTION:=libs
@ -38,7 +39,7 @@ CONFIGURE_ARGS += \
--with-sdl-exec-prefix=$(STAGING_DIR)
CONFIGURE_VARS += \
LIBS="-lSDL -ldirect -ldirectfb -lfusion -liconv"
LIBS="-lSDL -ldirect -ldirectfb -lfusion"
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/SDL $(1)/usr/lib/pkgconfig

View File

@ -19,13 +19,14 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/SDL_ttf-$(PKG_VERSION)
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/libsdl-ttf
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Simple DirectMedia Layer True Font
URL:=http://www.libsdl.org/projects/SDL_ttf/
DEPENDS:=+libsdl
DEPENDS:=+libsdl $(ICONV_DEPENDS) $(INTL_DEPENDS)
endef
define Package/libsdl-ttf/description
@ -39,12 +40,10 @@ TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/SDL
CONFIGURE_ARGS += \
--with-sdl-exec-prefix=$(STAGING_DIR) \
--without-x \
LIBS="-lSDL"
LIBS="-lSDL -liconv"
TARGET_LDFLAGS+= \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
define Build/InstallDev
$(INSTALL_DIR) \