r2162 - in trunk

[dslinux_gpf at dslinux.in-berlin.de]

Author: gpf
Date: 2008-03-08 11:48:36 +0100 (Sat, 08 Mar 2008)
New Revision: 2162

Log:
add xrick and libSDL to build system

Modified: trunk/config/Configure.help
===================================================================
--- trunk/config/Configure.help	2008-03-08 10:12:20 UTC (rev 2161)
+++ trunk/config/Configure.help	2008-03-08 10:48:36 UTC (rev 2162)
@@ -738,6 +738,11 @@
   Only enable this if you want to force the library to be built.  The
   Config will make sure this library is built if it is needed.
 
+ CONFIG_LIB_SDL_FORCE
+  SDL library.
+  Only enable this if you want to force the library to be built.  The
+  Config will make sure this library is built if it is needed.
+
 CONFIG_LIB_LIBSSL_FORCE
   SSL library.
   Only enable this if you want to force the library to be built.  The
@@ -1744,6 +1749,9 @@
 CONFIG_USER_GAMES_RUBIK
   Non-optimal rubik's cube solver.
 
+CONFIG_USER_UNITS_XRICK
+ Rick Dangerous for the console.
+
 CONFIG_USER_PPPD_WITH_TACACS
   TACACS+ authentication plugin for pppd.
 

Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in	2008-03-08 10:12:20 UTC (rev 2161)
+++ trunk/config/config.in	2008-03-08 10:48:36 UTC (rev 2162)
@@ -119,8 +119,9 @@
 bool 'Build uClibc++'		CONFIG_LIB_UCLIBCPP_FORCE
 bool 'Build libwww'		CONFIG_LIB_LIBWWW_FORCE
 bool 'Build libiconv'		CONFIG_LIB_LIBICONV_FORCE
-bool 'Build libgettext'	CONFIG_LIB_LIBGETTEXT_FORCE
+bool 'Build libgettext'	        CONFIG_LIB_LIBGETTEXT_FORCE
 bool 'Build libglib'		CONFIG_LIB_LIBGLIB_FORCE
+bool 'Build libSDL'             CONFIG_LIB_SDL_FORCE
 
 comment 'Library Configuration'
 bool 'Support time zones'	CONFIG_LIB_UC_LIBC_TIMEZONE
@@ -871,6 +872,9 @@
 	bool '    funzip'		CONFIG_USER_UNZIP_FUNZIP
 fi
 bool 'unzoo'			CONFIG_USER_UNZOO_UNZOO
+if [ "$CONFIG_USER_GAMES_XRICK" = "y" ]; then
+       define_bool CONFIG_LIB_SDL y
+fi
 bool 'zmodem utils'		CONFIG_USER_LRZSZ_LRZSZ
 
 if [ "$CONFIG_USER_LRZSZ_LRZSZ" = "y" ]; then
@@ -1756,6 +1760,7 @@
 # bool 'mame'		CONFIG_USER_GAMES_XMAME
 bool 'rubik'		CONFIG_USER_GAMES_RUBIK
 bool 'sudoku'		CONFIG_USER_GAMES_SUDOKU
+bool 'xrick'            CONFIG_USER_GAMES_XRICK
 endmenu
 
 #############################################################################

Modified: trunk/include/Makefile
===================================================================
--- trunk/include/Makefile	2008-03-08 10:12:20 UTC (rev 2161)
+++ trunk/include/Makefile	2008-03-08 10:48:36 UTC (rev 2162)
@@ -70,8 +70,8 @@
 	$(ROOTDIR)/lib/gettext/src/gettext-runtime/intl/libintl.h,. \
 	$(ROOTDIR)/lib/glib/src/glib/glib.h,. \
 	$(ROOTDIR)/lib/glib/src/glibconfig.h,. \
-	$(ROOTDIR)/lib/glib/src/glib/,.
-
+	$(ROOTDIR)/lib/glib/src/glib/,. \
+	$(ROOTDIR)/lib/sdl/src/include/*.h,.
 #
 # Both freeswan and openswan can provide des and crypto headers
 # and we need to make sure we are using the correct ones.

Modified: trunk/lib/Makefile
===================================================================
--- trunk/lib/Makefile	2008-03-08 10:12:20 UTC (rev 2161)
+++ trunk/lib/Makefile	2008-03-08 10:48:36 UTC (rev 2162)
@@ -102,6 +102,8 @@
 dir_$(CONFIG_LIB_LIBGETTEXT_FORCE)  += gettext
 dir_$(CONFIG_LIB_LIBGLIB)	+= glib
 dir_$(CONFIG_LIB_LIBGLIB_FORCE)  += glib
+ dir_$(CONFIG_LIB_SDL)       += sdl
+ dir_$(CONFIG_LIB_SDL_FORCE) += sdl
 
 # And build libraries in the prop directory last
 dir_y += $(ROOTDIR)/prop
@@ -194,7 +196,8 @@
 	$(ROOTDIR)/lib/libiconv/src/lib/.libs/*.a \
 	$(ROOTDIR)/lib/gettext/src/gettext-runtime/intl/.libs/*.a \
 	$(ROOTDIR)/lib/glib/src/glib/.libs/*.a \
-	$(ROOTDIR)/lib/glib/src/gmodule/.libs/*.a
+	$(ROOTDIR)/lib/glib/src/gmodule/.libs/*.a \
+	$(ROOTDIR)/lib/sdl/src/build/.libs/*.a
 
 ##############################################################################
 

Modified: trunk/user/games/Makefile
===================================================================
--- trunk/user/games/Makefile	2008-03-08 10:12:20 UTC (rev 2161)
+++ trunk/user/games/Makefile	2008-03-08 10:48:36 UTC (rev 2162)
@@ -15,6 +15,7 @@
 dir_$(CONFIG_USER_GAMES_PACMAN)		+= pacman
 dir_$(CONFIG_USER_GAMES_RUBIK)          += rubik
 dir_$(CONFIG_USER_GAMES_SUDOKU)			+= sudoku
+dir_$(CONFIG_USER_GAMES_XRICK)             += xrick
 #dir_$(CONFIG_USER_GAMES_XMAME)		    += xmame
 
 all:

Modified: trunk/user/games/xrick/Makefile
===================================================================
--- trunk/user/games/xrick/Makefile	2008-03-08 10:12:20 UTC (rev 2161)
+++ trunk/user/games/xrick/Makefile	2008-03-08 10:48:36 UTC (rev 2162)
@@ -11,6 +11,6 @@
 	rm -f .compiled
 
 romfs:
-	$(ROMFSINST) src/xrick /bin/xrick
+	$(ROMFSINST) src/xrick /usr/games/xrick
 	$(ROMFSINST) -d data.zip /usr/share/games/xrick/data.zip
 

Modified: trunk/vendors/Nintendo/DLDI/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.vendor	2008-03-08 10:12:20 UTC (rev 2161)
+++ trunk/vendors/Nintendo/DLDI/config.vendor	2008-03-08 10:48:36 UTC (rev 2162)
@@ -1066,6 +1066,7 @@
 CONFIG_USER_GAMES_PACMAN=y
 # CONFIG_USER_GAMES_RUBIK is not set
 CONFIG_USER_GAMES_SUDOKU=y
+CONFIG_USER_GAMES_XRICK=y
 
 #
 # Miscellaneous Configuration