r1979 - in trunk

[dslinux_gpf at dslinux.in-berlin.de]

Author: gpf
Date: 2007-10-10 23:27:29 +0200 (Wed, 10 Oct 2007)
New Revision: 1979

Log:
pacman for DSLinux, Patch contributed by skibur

Modified: trunk/config/Configure.help
===================================================================
--- trunk/config/Configure.help	2007-10-10 20:21:03 UTC (rev 1978)
+++ trunk/config/Configure.help	2007-10-10 21:27:29 UTC (rev 1979)
@@ -1676,6 +1676,9 @@
   The Dungeon Adventure game.  To play, telnet to port 8899 or run
   dungeon from the command line.
 
+CONFIG_USER_GAMES_PACMAN
+  Pacman for console.
+
 CONFIG_USER_GAMES_RUBIK
   Non-optimal rubik's cube solver.
 

Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in	2007-10-10 20:21:03 UTC (rev 1978)
+++ trunk/config/config.in	2007-10-10 21:27:29 UTC (rev 1979)
@@ -1722,6 +1722,7 @@
 fi
 bool 'cnibbles'		CONFIG_USER_GAMES_CNIBBLES
 bool 'dungeon'		CONFIG_USER_GAMES_DUNGEON
+bool 'pacman'		CONFIG_USER_GAMES_PACMAN
 # bool 'mame'		CONFIG_USER_GAMES_XMAME
 bool 'rubik'		CONFIG_USER_GAMES_RUBIK
 bool 'sudoku'		CONFIG_USER_GAMES_SUDOKU

Modified: trunk/user/games/Makefile
===================================================================
--- trunk/user/games/Makefile	2007-10-10 20:21:03 UTC (rev 1978)
+++ trunk/user/games/Makefile	2007-10-10 21:27:29 UTC (rev 1979)
@@ -12,6 +12,7 @@
 dir_$(CONFIG_USER_GAMES_BSDGAMES)	+= bsdgames
 dir_$(CONFIG_USER_GAMES_CNIBBLES)	+= cnibbles
 dir_$(CONFIG_USER_GAMES_DUNGEON)        += dungeon
+dir_$(CONFIG_USER_GAMES_PACMAN)		+= pacman
 dir_$(CONFIG_USER_GAMES_RUBIK)          += rubik
 dir_$(CONFIG_USER_GAMES_SUDOKU)			+= sudoku
 #dir_$(CONFIG_USER_GAMES_XMAME)		    += xmame

Copied: trunk/user/games/pacman (from rev 1978, tags/pacman/pacman-1.2)

Modified: trunk/user/games/pacman/Makefile
===================================================================
--- tags/pacman/pacman-1.2/Makefile	2007-10-10 20:21:03 UTC (rev 1978)
+++ trunk/user/games/pacman/Makefile	2007-10-10 21:27:29 UTC (rev 1979)
@@ -1,27 +1,37 @@
-all:
-	gcc -lncurses pacman.c     -o pacman
-	gcc -lncurses pacmanedit.c -o pacmanedit
+# Makefile for Pacman
+ 
+LIBS =  -L$(ROOTDIR)/lib/libncurses/lib -lncurses
+CFLAGS += -I$(ROOTDIR)/lib/libncurses/include
+ 
+EXEC = pacman 
+EXEC2 = pacmanedit
+OBJS = pacman.o
+OBJS2 = pacmanedit.o
+ 
+.PHONY: all romfs clean
+ 
+all: $(EXEC) $(EXEC2)
+ 
+$(EXEC): $(OBJS)
+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+$(EXEC2): $(OBJS2)
+	$(CC) $(LDFLAGS) -o $@ $(OBJS2) $(LIBS)
+ 
+romfs: 
+	$(ROMFSINST) /usr/games/$(EXEC)
+	$(ROMFSINST) /usr/games/$(EXEC2)
+	$(ROMFSINST) -d Levels/level01.dat /usr/share/games/pacman/Levels/level01.dat
+	$(ROMFSINST) -d Levels/level02.dat /usr/share/games/pacman/Levels/level02.dat
+	$(ROMFSINST) -d Levels/level03.dat /usr/share/games/pacman/Levels/level03.dat
+	$(ROMFSINST) -d Levels/level04.dat /usr/share/games/pacman/Levels/level04.dat
+	$(ROMFSINST) -d Levels/level05.dat /usr/share/games/pacman/Levels/level05.dat
+	$(ROMFSINST) -d Levels/level06.dat /usr/share/games/pacman/Levels/level06.dat
+	$(ROMFSINST) -d Levels/level07.dat /usr/share/games/pacman/Levels/level07.dat
+	$(ROMFSINST) -d Levels/level08.dat /usr/share/games/pacman/Levels/level08.dat
+	$(ROMFSINST) -d Levels/level09.dat /usr/share/games/pacman/Levels/level09.dat
+	$(ROMFSINST) -d Levels/README /usr/share/games/pacman/Levels/README
+	$(ROMFSINST) -d Levels/template.dat /usr/share/games/pacman/Levels/template.dat
 
-install:	all
-	cp pacman /usr/local/bin
-	cp pacmanedit /usr/local/bin
-	mkdir -p /usr/local/share/pacman
-	cp -fR Levels/ /usr/local/share/pacman/
-	chown root:games /usr/local/bin/pacman
-	chown root:games /usr/local/share/pacman -R
-	chmod 750 /usr/local/bin/pacman
-	chmod 750 /usr/local/bin/pacmanedit
-	chmod 750 /usr/local/share/pacman/ -R
-
-uninstall:
-	rm -f /usr/local/bin/pacman
-	rm -f /usr/local/bin/pacmanedit
-	rm -f /usr/local/share/pacman/Levels/level0[1-9].dat
-	rm -f /usr/local/share/pacman/Levels/README
-	rm -f /usr/local/share/pacman/Levels/template.dat
-	if [ -e /usr/local/share/pacman/Levels/ ] ; then rmdir /usr/local/share/pacman/Levels/ ; fi
-	if [ -e /usr/local/share/pacman/ ] ; then rmdir /usr/local/share/pacman/ ; fi
-
-clean:	uninstall
-	rm -f pacman
-	rm -f pacmanedit
+clean:
+	rm -f $(EXEC) $(EXEC2) *.elf *.gdb *.o

Modified: trunk/user/games/pacman/pacman.h
===================================================================
--- tags/pacman/pacman-1.2/pacman.h	2007-10-10 20:21:03 UTC (rev 1978)
+++ trunk/user/games/pacman/pacman.h	2007-10-10 21:27:29 UTC (rev 1979)
@@ -1,5 +1,5 @@
 // Some variables that you may want to change
-char LevelFile[50] = "/usr/local/share/pacman/Levels/level__.dat";	//Locations of default levels
+char LevelFile[60] = "/usr/share/games/pacman/Levels/level__.dat";	//Locations of default levels
 int FreeLife = 1000;							//Starting points for free life
 int Points = 0;								//Initial points
 int Lives = 3;								//Number of lives you start with

Modified: trunk/vendors/Nintendo/DLDI/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.vendor	2007-10-10 20:21:03 UTC (rev 1978)
+++ trunk/vendors/Nintendo/DLDI/config.vendor	2007-10-10 21:27:29 UTC (rev 1979)
@@ -1017,6 +1017,7 @@
 CONFIG_USER_GAMES_BSDGAMES_WUMP=y
 CONFIG_USER_GAMES_CNIBBLES=y
 CONFIG_USER_GAMES_DUNGEON=y
+CONFIG_USER_GAMES_PACMAN=y
 # CONFIG_USER_GAMES_RUBIK is not set
 CONFIG_USER_GAMES_SUDOKU=y