r1955 - in trunk

[dslinux_gpf at dslinux.in-berlin.de]

Author: gpf
Date: 2007-10-02 05:59:44 +0200 (Tue, 02 Oct 2007)
New Revision: 1955

Log:
add libpng support to microwin, fix libpng to not use floating support, and increase the stacksize to 512kb for viewML


Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in	2007-10-01 21:40:22 UTC (rev 1954)
+++ trunk/config/config.in	2007-10-02 03:59:44 UTC (rev 1955)
@@ -1604,6 +1604,10 @@
             define_bool CONFIG_LIB_LIBJPEG y
     	fi
 	bool 'Have PNG Support' CONFIG_USER_MICROWIN_HAVE_PNG_SUPPORT
+    	if [ "$CONFIG_USER_MICROWIN_HAVE_PNG_SUPPORT" = "y" ]; then
+	define_bool CONFIG_LIB_LIBPNG y
+	define_bool CONFIG_LIB_ZLIB y
+    	fi
 	bool 'Have T1LIB Support' CONFIG_USER_MICROWIN_HAVE_T1LIB_SUPPORT
 	bool 'Have FreeType Support' CONFIG_USER_MICROWIN_HAVE_FREETYPE_SUPPORT
 	bool 'Have SharedMemory Support' CONFIG_USER_MICROWIN_HAVE_SHAREDMEM_SUPPORT

Modified: trunk/lib/libpng/Makefile
===================================================================
--- trunk/lib/libpng/Makefile	2007-10-01 21:40:22 UTC (rev 1954)
+++ trunk/lib/libpng/Makefile	2007-10-02 03:59:44 UTC (rev 1955)
@@ -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) # $(WARNMORE) -g -DPNG_DEBUG=5
+	$(ALIGN) -DPNG_NO_FLOATING_POINT_SUPPORTED # $(WARNMORE) -g -DPNG_DEBUG=5 
 #LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
 
 #RANLIB=ranlib

Modified: trunk/user/microwin/src/config
===================================================================
--- trunk/user/microwin/src/config	2007-10-01 21:40:22 UTC (rev 1954)
+++ trunk/user/microwin/src/config	2007-10-02 03:59:44 UTC (rev 1955)
@@ -208,9 +208,9 @@
 LIBZ                     = /usr/lib/libz.a
 else
 HAVE_PNG_SUPPORT         = $(subst y,Y,$(CONFIG_USER_MICROWIN_HAVE_PNG_SUPPORT))
-# INCPNG                   = .
-# LIBPNG                   = /usr/lib/libpng.a
-# LIBZ                     = /usr/lib/libz.a
+INCPNG                   = $(ROOTDIR)/include
+LIBPNG                   = $(ROOTDIR)/lib/libpng.a
+LIBZ                     = $(ROOTDIR)/lib/libz.a
 endif
 
 ####################################################################

Modified: trunk/user/pixil/packages/viewml/viewml/src/Makefile.new
===================================================================
--- trunk/user/pixil/packages/viewml/viewml/src/Makefile.new	2007-10-01 21:40:22 UTC (rev 1954)
+++ trunk/user/pixil/packages/viewml/viewml/src/Makefile.new	2007-10-02 03:59:44 UTC (rev 1955)
@@ -29,7 +29,7 @@
 
 all: $(OBJS) $(OTHEROBJS)
 	$(CXX) -o $(VIEWML_BINARY) $(CRTBEGIN) $(CXXFLAGS) $(CFLAGS) $(INCLUDES) -I.. $(LDFLAGS) $(OBJS) $(OTHEROBJS) $(LIBS) $(CXXLIBS) $(LDLIBS) $(CRTEND)
-	arm-linux-elf-flthdr -s 8192 $(VIEWML_BINARY)
+	arm-linux-elf-flthdr -s 512000 $(VIEWML_BINARY)
 
 .build_depends:
 	@echo "       ===== Alert =====" 

Modified: trunk/vendors/Nintendo/DLDI/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.vendor	2007-10-01 21:40:22 UTC (rev 1954)
+++ trunk/vendors/Nintendo/DLDI/config.vendor	2007-10-02 03:59:44 UTC (rev 1955)
@@ -900,7 +900,7 @@
 CONFIG_USER_MICROWIN_HAVE_PNM_SUPPORT=y
 CONFIG_USER_MICROWIN_HAVE_XPM_SUPPORT=y
 CONFIG_USER_MICROWIN_HAVE_JPEG_SUPPORT=y
-# CONFIG_USER_MICROWIN_HAVE_PNG_SUPPORT is not set
+CONFIG_USER_MICROWIN_HAVE_PNG_SUPPORT=y
 # CONFIG_USER_MICROWIN_HAVE_T1LIB_SUPPORT is not set
 # CONFIG_USER_MICROWIN_HAVE_FREETYPE_SUPPORT is not set
 CONFIG_USER_MICROWIN_HAVE_SHAREDMEM_SUPPORT=y