From 1086fc5246d0bec95228437cf2a2eabf84a3f5b3 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Tue, 21 Aug 2012 14:17:11 +0100 Subject: Change order of libs. --- gtk/Makefile.target | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gtk') diff --git a/gtk/Makefile.target b/gtk/Makefile.target index 488b8491f..0fd0acfe3 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 -- cgit v1.2.3