diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2011-09-16 11:09:58 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2011-09-16 11:09:58 +0000 |
| commit | 33df7bb9a034354c7a6aae6a73fe38b15ac55736 (patch) | |
| tree | 24b549d648f586ffc65488e6415a06266a83bd1b | |
| parent | 2ae7efc7de65371d3a31a85f58bec04091dba2e0 (diff) | |
| download | netsurf-33df7bb9a034354c7a6aae6a73fe38b15ac55736.tar.gz netsurf-33df7bb9a034354c7a6aae6a73fe38b15ac55736.tar.bz2 | |
ensure depricated interfaces are not used
svn path=/trunk/netsurf/; revision=12800
| -rw-r--r-- | gtk/Makefile.target | 73 |
1 files changed, 38 insertions, 35 deletions
diff --git a/gtk/Makefile.target b/gtk/Makefile.target index 16f7da4ef..41f08d074 100644 --- a/gtk/Makefile.target +++ b/gtk/Makefile.target @@ -2,32 +2,41 @@ # GTK flag setup (using pkg-config) # ---------------------------------------------------------------------------- +LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libhubbub libcss) +LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl) - LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libhubbub libcss) - LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl) +# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here +NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG +NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG +NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE +NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP +NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF +NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG +NETSURF_FEATURE_WEBP_CFLAGS := -DWITH_WEBP - # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here - NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG - NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG - NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE - NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP - NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF - NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG - NETSURF_FEATURE_WEBP_CFLAGS := -DWITH_WEBP +# add a line similar to below for each optional pkg-configed lib here +$(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 )) - # add a line similar to below for each optional pkg-configed lib here - $(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 )) +# no pkg-config for this library +$(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp,WebP (libwebp))) - # no pkg-config for this library - $(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp,WebP (libwebp))) +# GTK and GLIB flags to disable depricated usage +GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \ + -DG_DISABLE_DEPRECATED \ + -DGTK_DISABLE_SINGLE_INCLUDES \ + -DPANGO_DISABLE_DEPRECATED \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + -DGTK_MULTIHEAD_SAFE - GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \ - -DGTK_DISABLE_DEPRECATED \ +GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \ + $(GTKDEPFLAGS) \ -D_BSD_SOURCE \ -D_XOPEN_SOURCE=600 \ -D_POSIX_C_SOURCE=200112L \ @@ -39,24 +48,18 @@ $(shell $(PKG_CONFIG) --cflags openssl) \ $(shell xml2-config --cflags) - # The GTK build can also enable the following deprication flags - # -DG_DISABLE_SINGLE_INCLUDES -DG_DISABLE_DEPRECATED - # -DGTK_DISABLE_SINGLE_INCLUDES -DPANGO_DISABLE_DEPRECATED - # -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED - # -DGTK_DISABLE_DEPRECATED -DGTK_MULTIHEAD_SAFE +GTKLDFLAGS := $(shell $(PKG_CONFIG) --cflags --libs libglade-2.0 gtk+-2.0 gthread-2.0 gmodule-2.0 lcms) - GTKLDFLAGS := $(shell $(PKG_CONFIG) --cflags --libs libglade-2.0 gtk+-2.0 gthread-2.0 gmodule-2.0 lcms) +CFLAGS += $(GTKCFLAGS) +LDFLAGS += $(GTKLDFLAGS) - CFLAGS += $(GTKCFLAGS) - LDFLAGS += $(GTKLDFLAGS) +# --------------------------------------------------------------------------- +# Windows flag setup +# --------------------------------------------------------------------------- - # --------------------------------------------------------------------------- - # Windows flag setup - # --------------------------------------------------------------------------- - - ifeq ($(HOST),Windows_NT) +ifeq ($(HOST),Windows_NT) CFLAGS += -U__STRICT_ANSI__ - endif +endif # ---------------------------------------------------------------------------- # Source file setup |