update apps to profit from the latest changes in qt4

This commit is contained in:
kyak 2011-02-22 20:10:31 +03:00
parent 78ccf86809
commit 598a81d670
5 changed files with 8 additions and 83 deletions

View File

@ -41,28 +41,6 @@ endef
TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
define Build/Prepare
$(call Build/Prepare/Default)
(\
cd $(PKG_BUILD_DIR); \
echo "QMAKE_UIC=$(STAGING_DIR_HOST)/bin/uic" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
echo "QMAKE_MOC=$(STAGING_DIR_HOST)/bin/moc" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
echo "QMAKE_RCC=$(STAGING_DIR_HOST)/bin/rcc" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
echo "QMAKE_CC=$(TARGET_CC)" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
echo "QMAKE_CXX=$(TARGET_CXX)" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
echo "QMAKE_LINK=$(TARGET_CXX)" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
echo "QMAKE_LIBS+=$(INTL_LDFLAGS)" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
echo "QMAKE_LIBS+=$(ICONV_LDFLAGS)" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
echo "QMAKE_LIBS+=-L$(STAGING_DIR)/usr/lib" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
echo "QMAKE_LIBS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/Qt" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtGui" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtCore" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtNetwork" | tee -a nanomap.pro app.pro monav/monav.pro monav/contractionhierarchies/contractionhierarchiesclient.pro monav/gpsgrid/gpsgridclient.pro monav/unicodetournamenttrie/unicodetournamenttrieclient.pro ; \
)
endef
define Build/Configure
$(call Build/Configure/Qmake,nanomap)
endef

View File

@ -21,20 +21,12 @@ define Package/Tile
DEPENDS:=+qt4 +qt4-gui +dejavu-fonts-ttf
endef
define Build/Prepare
$(call Build/Prepare/Default)
(\
cd $(PKG_BUILD_DIR); \
echo "QMAKE_LIBS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" >> Tile.pro; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtGui" >> Tile.pro; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtCore" >> Tile.pro; \
)
endef
define Build/Configure
$(call Build/Configure/Qmake,Tile)
endef
TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
define Package/Tile/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/Tile $(1)/usr/bin/

View File

@ -28,20 +28,12 @@ define Package/gottet
DEPENDS:=+qt4 +qt4-gui +dejavu-fonts-ttf
endef
define Build/Prepare
$(call Build/Prepare/Default)
(\
cd $(PKG_BUILD_DIR); \
echo "QMAKE_LIBS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" >> gottet.pro; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtGui" >> gottet.pro; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtCore" >> gottet.pro; \
)
endef
define Build/Configure
$(call Build/Configure/Qmake,gottet)
endef
TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
define Package/gottet/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/gottet $(1)/usr/bin/

View File

@ -28,28 +28,12 @@ define Package/qball
URL:=http://homepage.ntlworld.com/mark.harman/comp_qball.html
endef
define Build/Prepare
$(call Build/Prepare/Default)
(\
cd $(PKG_BUILD_DIR); \
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+=$(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; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtGui" >> QBall.pro; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtCore" >> QBall.pro; \
)
endef
define Build/Configure
$(call Build/Configure/Qmake,QBall)
endef
TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
define Package/qball/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/QBall $(1)/usr/bin/qball

View File

@ -24,33 +24,12 @@ define Package/qstardict
URL:=http://qstardict.ylsoftware.com
endef
define Build/Prepare
$(call Build/Prepare/Default)
(\
cd $(PKG_BUILD_DIR); \
echo "QMAKE_UIC=$(STAGING_DIR_HOST)/bin/uic" >> qstardict.pri; \
echo "QMAKE_MOC=$(STAGING_DIR_HOST)/bin/moc" >> qstardict.pri; \
echo "QMAKE_RCC=$(STAGING_DIR_HOST)/bin/rcc" >> qstardict.pri; \
echo "QMAKE_CC=$(TARGET_CC)" >> qstardict.pri; \
echo "QMAKE_CXX=$(TARGET_CXX)" >> qstardict.pri; \
echo "QMAKE_LINK=$(TARGET_CXX)" >> qstardict.pri; \
echo "QMAKE_LIBS+=$(INTL_LDFLAGS)" >> qstardict.pri; \
echo "QMAKE_LIBS+=$(ICONV_LDFLAGS)" >> qstardict.pri; \
echo "QMAKE_LIBS+=-L$(STAGING_DIR)/usr/lib" >> qstardict.pri; \
echo "QMAKE_LIBS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" >> qstardict.pri; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include" >> qstardict.pri; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/Qt" >> qstardict.pri; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtGui" >> qstardict.pri; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtCore" >> qstardict.pri; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtNetwork" >> qstardict.pri; \
echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtXml" >> qstardict.pri; \
)
endef
define Build/Configure
$(call Build/Configure/Qmake,qstardict)
endef
TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
define Package/qstardict/install
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/qstardict/plugins
$(INSTALL_BIN) $(PKG_BUILD_DIR)/qstardict/qstardict $(1)/usr/bin/