From 24d2f333f0ad773fdb33a0874f659a4274ef6d55 Mon Sep 17 00:00:00 2001 From: kyak Date: Sun, 6 Feb 2011 22:14:51 +0300 Subject: [PATCH] qball: use ICONV notation --- qball/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qball/Makefile b/qball/Makefile index 1af5614..9ef019d 100644 --- a/qball/Makefile +++ b/qball/Makefile @@ -14,6 +14,7 @@ PKG_MD5SUM:=106736362979921cd02fa7675f38c483 UNZIP_CMD=unzip -d $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) $(DL_DIR)/$(PKG_SOURCE) include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/QBall @@ -35,8 +36,8 @@ echo "QMAKE_UIC=$(STAGING_DIR_HOST)/bin/uic" >> QBall.pro; \ echo "QMAKE_MOC=$(STAGING_DIR_HOST)/bin/moc" >> QBall.pro; \ echo "QMAKE_RCC=$(STAGING_DIR_HOST)/bin/rcc" >> QBall.pro; \ echo "QMAKE_LINK=$(TARGET_CXX)" >> QBall.pro; \ -echo "QMAKE_LIBS+=-L$(STAGING_DIR)/usr/lib/libintl/lib" >> QBall.pro; \ -echo "QMAKE_LIBS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib" >> QBall.pro; \ +echo "QMAKE_LIBS+=$(INTL_LDFLAGS)" >> QBall.pro; \ +echo "QMAKE_LIBS+=$(ICONV_LDFLAGS)" >> QBall.pro; \ echo "QMAKE_LIBS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" >> QBall.pro; \ echo "INCLUDEPATH += $(STAGING_DIR)/usr/include" >> QBall.pro; \ echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/Qt" >> QBall.pro; \