diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2011-01-02 23:27:23 +0100 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2011-01-02 23:27:23 +0100 |
| commit | 9352995934adec8059077af241c35ccd1573bd80 (patch) | |
| tree | 60286e266b3b31b90b952ac37e12a1ebbcdd2eb6 /gmenu2x/Makefile | |
| parent | ef3b84d78197acbd45d73a9b1ae44b47b5904290 (diff) | |
| parent | 880bca260c4ce91554a49b2475232cf5c0ffd447 (diff) | |
| download | qipackages-fork-9352995934adec8059077af241c35ccd1573bd80.tar.gz | |
Conflicts:
links/Makefile
Diffstat (limited to 'gmenu2x/Makefile')
| -rw-r--r-- | gmenu2x/Makefile | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/gmenu2x/Makefile b/gmenu2x/Makefile index cc63502..cebbf48 100644 --- a/gmenu2x/Makefile +++ b/gmenu2x/Makefile @@ -8,9 +8,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gmenu2x -PKG_VERSION:=20100905 -PKG_REV:=0775638dbcbc491d98df3c8932a933d1be2790d6 +PKG_VERSION:=20101122 +PKG_REV:=6773ad7d3a82c349a9edc9881e7c7330b09a931c PKG_RELEASE:=1 +PKG_INSTALL:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=git://projects.qi-hardware.com/gmenu2x.git @@ -18,8 +19,6 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_INSTALL:=1 - PKG_BUILD_DEPENDS:=sparsehash include $(INCLUDE_DIR)/package.mk @@ -34,10 +33,8 @@ TARGET_CPPFLAGS+= \ -I$(STAGING_DIR)/usr/include/SDL \ -I$(STAGING_DIR)/usr/include/google/sparsehash \ -I$(PKG_BUILD_DIR)/src/tinyxml \ + -DLOG_LEVEL=0 -# -I$(STAGING_DIR)/usr/lib/libintl/include \ -# -I$(STAGING_DIR)/usr/libiconv/include -# TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -L$(STAGING_DIR)/usr/lib/SDL \ @@ -66,7 +63,7 @@ define Package/gmenu2x/install $(1)/usr/share/gmenu2x/ $(INSTALL_BIN) \ - $(PKG_BUILD_DIR)/gmenu2x.sh \ + ./files/nanonote/bin/gmenu2x \ $(1)/usr/bin/gmenu2x $(CP) \ @@ -74,11 +71,15 @@ define Package/gmenu2x/install $(1)/usr/share/gmenu2x/ $(CP) \ - ./files/input.conf \ - $(1)/usr/share/gmenu2x/ + $(PKG_BUILD_DIR)/input.conf.nanonote \ + $(1)/usr/share/gmenu2x/input.conf rm -rf \ $(1)/usr/share/gmenu2x/sections/{emulators,games} + + $(CP) \ + ./files/nanonote/gmenu2x/* \ + $(1)/usr/share/gmenu2x/ endef $(eval $(call BuildPackage,gmenu2x)) |