Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic
@ 2008-07-24 13:21 Hans-Christian Egtvedt
  2008-07-24 13:21 ` [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net Hans-Christian Egtvedt
  2008-07-24 14:33 ` [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Bernhard Fischer
  0 siblings, 2 replies; 11+ messages in thread
From: Hans-Christian Egtvedt @ 2008-07-24 13:21 UTC (permalink / raw)
  To: buildroot

This patch will let the user install the Doom shareware wad file if lxdoom or
lsdldoom is selected. The wad file will also be installed into
/usr/share/games/doom directory, since the client will search this directory
when starting.

The Makefile rule has also been altered to depend on the installed wad file, so
it will be multiple project safe.

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
---
 package/lxdoom/Config.in     |    6 ++++--
 package/lxdoom/lxdoom-wad.mk |   10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/package/lxdoom/Config.in b/package/lxdoom/Config.in
index 892e45c..3b318e1 100644
--- a/package/lxdoom/Config.in
+++ b/package/lxdoom/Config.in
@@ -3,7 +3,9 @@ config BR2_PACKAGE_LXDOOM
 	help
 	  This is the linux version of the popular doom game.
 config BR2_PACKAGE_LXDOOM_WAD
-	bool "lxdoom-wad"
+	bool "doom shareware wad file"
 	depends on BR2_PACKAGE_LXDOOM
 	help
-	  This is the shareware wad data files for the doom game.
+	  This will install the the shareware wad data file for the doom game.
+
+	  The wad file will be placed in /usr/share/games/doom/doom1.wad
diff --git a/package/lxdoom/lxdoom-wad.mk b/package/lxdoom/lxdoom-wad.mk
index 41b8ed8..4e38574 100644
--- a/package/lxdoom/lxdoom-wad.mk
+++ b/package/lxdoom/lxdoom-wad.mk
@@ -15,14 +15,14 @@ $(DL_DIR)/$(LXDOOM_WAD_SOURCE):
 $(LXDOOM_WAD_DIR)/.unpacked: $(DL_DIR)/$(LXDOOM_WAD_SOURCE)
 	mkdir -p $(LXDOOM_WAD_DIR)
 	cp -f $(DL_DIR)/$(LXDOOM_WAD_SOURCE) $(LXDOOM_WAD_DIR)
-	gunzip -d $(LXDOOM_WAD_DIR)/$(LXDOOM_WAD_SOURCE) 
+	gunzip -d $(LXDOOM_WAD_DIR)/$(LXDOOM_WAD_SOURCE)
 	touch $@
 
-$(LXDOOM_WAD_DIR)/.installed: $(LXDOOM_WAD_DIR)/.unpacked
-	cp -f $(LXDOOM_WAD_DIR)/* $(TARGET_DIR)/usr/games
-	touch $@
+$(TARGET_DIR)/usr/share/games/doom/doom1.wad: $(LXDOOM_WAD_DIR)/.unpacked
+	mkdir -p $(TARGET_DIR)/usr/share/games/doom
+	cp -f $(LXDOOM_WAD_DIR)/doom-$(LXDOOM_WAD_VERSION).wad $@
 
-lxdoom-wad: lxdoom $(LXDOOM_WAD_DIR)/.installed
+lxdoom-wad: uclibc $(TARGET_DIR)/usr/share/games/doom/doom1.wad
 
 #############################################################
 #
-- 
1.5.4.3

^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2008-07-24 14:45 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-24 13:21 [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Hans-Christian Egtvedt
2008-07-24 13:21 ` [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net Hans-Christian Egtvedt
2008-07-24 13:21   ` [Buildroot] [PATCH 3/5] PrBoom: add new package PrBoom Hans-Christian Egtvedt
2008-07-24 13:21     ` [Buildroot] [PATCH 4/5] lxdoom-wad: enable kconfig entry for PrBoom package Hans-Christian Egtvedt
2008-07-24 13:21       ` [Buildroot] [PATCH 5/5] lxdoom: make package depend on X11 server Hans-Christian Egtvedt
2008-07-24 13:23         ` Hans-Christian Egtvedt
2008-07-24 14:37           ` Bernhard Fischer
2008-07-24 14:35     ` [Buildroot] [PATCH 3/5] PrBoom: add new package PrBoom Bernhard Fischer
2008-07-24 14:35   ` [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net Bernhard Fischer
2008-07-24 14:33 ` [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Bernhard Fischer
2008-07-24 14:45   ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox