r1956 - in trunk
dslinux_amadeus at dslinux.in-berlin.de
dslinux_amadeus at dslinux.in-berlin.de
Tue Oct 2 21:04:23 CEST 2007
Author: amadeus
Date: 2007-10-02 21:04:17 +0200 (Tue, 02 Oct 2007)
New Revision: 1956
Log:
Fix build errors
Modified: trunk/lib/libpng/Makefile
===================================================================
--- trunk/lib/libpng/Makefile 2007-10-02 03:59:44 UTC (rev 1955)
+++ trunk/lib/libpng/Makefile 2007-10-02 19:04:17 UTC (rev 1956)
@@ -25,7 +25,7 @@
# for pgcc version 2.95.1, -O3 is buggy; don't use it.
CFLAGS += -I$(ZLIBINC) -Wall -O3 -funroll-loops \
- $(ALIGN) -DPNG_NO_FLOATING_POINT_SUPPORTED # $(WARNMORE) -g -DPNG_DEBUG=5
+ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
#RANLIB=ranlib
Modified: trunk/user/microwin/src/nanox/Makefile
===================================================================
--- trunk/user/microwin/src/nanox/Makefile 2007-10-02 03:59:44 UTC (rev 1955)
+++ trunk/user/microwin/src/nanox/Makefile 2007-10-02 19:04:17 UTC (rev 1956)
@@ -77,5 +77,5 @@
$(TOP)/bin/nano-X: $(NANOXFILES) $(NANOXSERVERLIBS) $(TOP)/config
@echo "Linking $@ ..."
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(NANOXFILES) $(NANOXSERVERLIBS) $(LDLIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(NANOXFILES) $(NANOXSERVERLIBS) -lm $(LDLIBS)
endif
Modified: trunk/vendors/Nintendo/DLDI/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.vendor 2007-10-02 03:59:44 UTC (rev 1955)
+++ trunk/vendors/Nintendo/DLDI/config.vendor 2007-10-02 19:04:17 UTC (rev 1956)
@@ -1014,6 +1014,7 @@
CONFIG_USER_GAMES_BSDGAMES_WORM=y
CONFIG_USER_GAMES_BSDGAMES_WORMS=y
CONFIG_USER_GAMES_BSDGAMES_WUMP=y
+CONFIG_USER_GAMES_CNIBBLES=y
CONFIG_USER_GAMES_DUNGEON=y
# CONFIG_USER_GAMES_RUBIK is not set
CONFIG_USER_GAMES_SUDOKU=y
More information about the dslinux-commit
mailing list