r5344 dsilvers - in /branches/vince/netsurf-fb: Makefile Makefile.config

netsurf at semichrome.net netsurf at semichrome.net
Tue Sep 16 10:21:06 BST 2008


Author: dsilvers
Date: Tue Sep 16 04:21:06 2008
New Revision: 5344

URL: http://source.netsurf-browser.org?rev=5344&view=rev
Log:
Fix up the framebuffer target makefile a bit more, add some config options for it

Modified:
    branches/vince/netsurf-fb/Makefile
    branches/vince/netsurf-fb/Makefile.config

Modified: branches/vince/netsurf-fb/Makefile
URL: http://source.netsurf-browser.org/branches/vince/netsurf-fb/Makefile?rev=5344&r1=5343&r2=5344&view=diff
==============================================================================
--- branches/vince/netsurf-fb/Makefile (original)
+++ branches/vince/netsurf-fb/Makefile Tue Sep 16 04:21:06 2008
@@ -437,23 +437,37 @@
 # ----------------------------------------------------------------------------
 
 ifeq ($(TARGET),framebuffer)
+  $(eval $(call feature_enabled,MNG,-DWITH_MNG,-lmng,PNG support))
+
+  # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
+  NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG
+  NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
+  NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB
+  NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
   NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
+
+  ifeq ($(NETSURF_FB_FRONTEND),linux)
+    $(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG rendering))
+    $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering))
+    $(eval $(call pkg_config_find_and_add,HUBBUB,libhubbub,Hubbub HTML parser))
+    $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,NetSurf BMP decoder))
+    $(eval $(call pkg_config_find_and_add,GIF,libnsgif,NetSurf GIF decoder))
+
+
+    CFLAGS += -std=c99 -I. -Dsmall $(WARNFLAGS) \
+	 	 $(shell xml2-config --cflags) \
+		 -D_BSD_SOURCE \
+		 -D_XOPEN_SOURCE=600 \
+		 -D_POSIX_C_SOURCE=200112L 
+
+    LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm 
+    LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl)
+  else
     $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,NetSurf GIF decoder))
-
-  $(eval $(call feature_enabled,MNG,-DWITH_MNG,-lmng,PNG support))
-
-#  CC=arm-able-gcc
-#  CFLAGS += -std=c99 -I. -I/usr/lib/able/include -Dsmall $(WARNFLAGS)
-#  LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm 
-  CC=gcc
-  CFLAGS += -std=c99 -I. -Dsmall $(WARNFLAGS) \
-		$(shell xml2-config --cflags) \
-		-D_BSD_SOURCE \
-		-D_XOPEN_SOURCE=600 \
-		-D_POSIX_C_SOURCE=200112L 
-
-  LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm 
-  LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl)
+    CC=arm-able-gcc
+    CFLAGS += -std=c99 -I. -I/usr/lib/able/include -Dsmall $(WARNFLAGS)
+    LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm 
+  endif
 endif
 
 # ----------------------------------------------------------------------------

Modified: branches/vince/netsurf-fb/Makefile.config
URL: http://source.netsurf-browser.org/branches/vince/netsurf-fb/Makefile.config?rev=5344&r1=5343&r2=5344&view=diff
==============================================================================
--- branches/vince/netsurf-fb/Makefile.config (original)
+++ branches/vince/netsurf-fb/Makefile.config Tue Sep 16 04:21:06 2008
@@ -11,7 +11,7 @@
 
 # Enable NetSurf's built-in BMP support
 # Valid options: YES, NO
-NETSURF_USE_BMP := NO
+NETSURF_USE_BMP := YES
 
 # Enable NetSurf's built-in GIF support
 # Valid options: YES, NO
@@ -28,7 +28,7 @@
 # Use libharu to enable PDF export and GTK printing support.  There is no
 # auto-detection available for this, as it does not have a pkg-config file.
 # Valid options: YES, NO
-NETSURF_USE_HARU_PDF := NO
+NETSURF_USE_HARU_PDF := YES
 
 # Enable stripping the NetSurf binary
 # Valid options: YES, NO
@@ -103,7 +103,7 @@
 
   # Use librsvg in conjunction with Cairo to render SVG images
   # Valid options: YES, NO, AUTO
-  NETSURF_USE_RSVG := NO
+  NETSURF_USE_RSVG := AUTO
 
   # Use James Shaw's librosprite for rendering RISC OS Sprites
   # Valid options: YES, NO, AUTO
@@ -168,6 +168,23 @@
   CFLAGS += -O0
 endif
 
+# ----------------------------------------------------------------------------
+# Framebuffer-target-specific options
+# ----------------------------------------------------------------------------
+ifeq ($(TARGET),framebuffer)
+  # Optimisation levels
+  CFLAGS += -O2 -Wuninitialized
+
+  # Framebuffer frontend.
+  # Valid values are: linux, able
+  NETSURF_FB_FRONTEND := linux
+
+  # Use libharu to enable PDF export and GTK printing support.
+  # Valid options: YES, NO
+  NETSURF_USE_HARU_PDF := NO
+
+endif
+
 # Include any local overrides
 -include Makefile.config.override
 




More information about the netsurf-commits mailing list