Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/7ffe9c2b5d85057876252896219f712663f9a6fc
...commit
http://git.netsurf-browser.org/netsurf.git/commit/7ffe9c2b5d85057876252896219f712663f9a6fc
...tree
http://git.netsurf-browser.org/netsurf.git/tree/7ffe9c2b5d85057876252896219f712663f9a6fc
The branch, master has been updated
via 7ffe9c2b5d85057876252896219f712663f9a6fc (commit)
via 1086fc5246d0bec95228437cf2a2eabf84a3f5b3 (commit)
from f0392b0790cae721ee50c8de75ef1308c34dbeb5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/7ffe9c2b5d85057876252896219f712663f9a6fc
commit 7ffe9c2b5d85057876252896219f712663f9a6fc
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Remove Makefile.resources.
diff --git a/Makefile.resources b/Makefile.resources
deleted file mode 100644
index 519499d..0000000
--- a/Makefile.resources
+++ /dev/null
@@ -1,19 +0,0 @@
-# Makefile for NetSurf's resources
-#
-# Copyright 2009 Daniel Silverstone <[email protected]>
-#
-#
-# This file provides the rules and setup for built-in resources for
-# the NetSurf browser binary.
-
-ifeq ($(TARGET),framebuffer)
-
-
-# End of framebuffer resource definitions
-endif
-
-ifeq ($(TARGET),windows)
-
-
-# End of windows resource definitions
-endif
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/1086fc5246d0bec95228437cf2a2eabf84a3f5b3
commit 1086fc5246d0bec95228437cf2a2eabf84a3f5b3
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Change order of libs.
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index 488b849..0fd0acf 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -13,23 +13,22 @@ NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
NETSURF_FEATURE_WEBP_CFLAGS := -DWITH_WEBP
-NETSURF_FEATURE_VIDEO_CFLAGS := -DWITH_VIDEO
NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0
NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0
+NETSURF_FEATURE_VIDEO_CFLAGS := -DWITH_VIDEO
-# add a line similar to below for each optional pkg-configed lib here
+# add a line similar to below for each optional lib here
+# note: webp lacks pkg-config file
+$(eval $(call pkg_config_find_and_add,PNG,libpng,PNG ))
+$(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP))
+$(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF))
$(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG))
$(eval $(call pkg_config_find_and_add,NSSVG,libsvgtiny,SVG))
$(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,Sprite))
-$(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP))
-$(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF))
-$(eval $(call pkg_config_find_and_add,PNG,libpng,PNG ))
-$(eval $(call pkg_config_find_and_add,VIDEO,gstreamer-0.10,Video))
+$(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp,WebP (libwebp)))
$(eval $(call pkg_config_find_and_add,MOZJS,mozjs185,JavaScript))
$(eval $(call pkg_config_find_and_add,JS,mozilla-js,JavaScript))
-
-# no pkg-config for this library
-$(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp,WebP (libwebp)))
+$(eval $(call pkg_config_find_and_add,VIDEO,gstreamer-0.10,Video))
ifeq ($(NETSURF_USE_MOZJS),YES)
NETSURF_USE_JS:=YES
-----------------------------------------------------------------------
Summary of changes:
Makefile.resources | 19 -------------------
gtk/Makefile.target | 17 ++++++++---------
2 files changed, 8 insertions(+), 28 deletions(-)
delete mode 100644 Makefile.resources
diff --git a/Makefile.resources b/Makefile.resources
deleted file mode 100644
index 519499d..0000000
--- a/Makefile.resources
+++ /dev/null
@@ -1,19 +0,0 @@
-# Makefile for NetSurf's resources
-#
-# Copyright 2009 Daniel Silverstone <[email protected]>
-#
-#
-# This file provides the rules and setup for built-in resources for
-# the NetSurf browser binary.
-
-ifeq ($(TARGET),framebuffer)
-
-
-# End of framebuffer resource definitions
-endif
-
-ifeq ($(TARGET),windows)
-
-
-# End of windows resource definitions
-endif
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index 488b849..0fd0acf 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -13,23 +13,22 @@ NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
NETSURF_FEATURE_WEBP_CFLAGS := -DWITH_WEBP
-NETSURF_FEATURE_VIDEO_CFLAGS := -DWITH_VIDEO
NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0
NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0
+NETSURF_FEATURE_VIDEO_CFLAGS := -DWITH_VIDEO
-# add a line similar to below for each optional pkg-configed lib here
+# add a line similar to below for each optional lib here
+# note: webp lacks pkg-config file
+$(eval $(call pkg_config_find_and_add,PNG,libpng,PNG ))
+$(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP))
+$(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF))
$(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG))
$(eval $(call pkg_config_find_and_add,NSSVG,libsvgtiny,SVG))
$(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,Sprite))
-$(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP))
-$(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF))
-$(eval $(call pkg_config_find_and_add,PNG,libpng,PNG ))
-$(eval $(call pkg_config_find_and_add,VIDEO,gstreamer-0.10,Video))
+$(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp,WebP (libwebp)))
$(eval $(call pkg_config_find_and_add,MOZJS,mozjs185,JavaScript))
$(eval $(call pkg_config_find_and_add,JS,mozilla-js,JavaScript))
-
-# no pkg-config for this library
-$(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp,WebP (libwebp)))
+$(eval $(call pkg_config_find_and_add,VIDEO,gstreamer-0.10,Video))
ifeq ($(NETSURF_USE_MOZJS),YES)
NETSURF_USE_JS:=YES
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
