diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2012-12-13 16:31:05 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2012-12-13 16:31:05 +0000 |
| commit | 45906b9dc2c87181f359289abc034f84b44947c4 (patch) | |
| tree | 17fc5e04bb4b4c5d3a429d818a2cd052f17104de /monkey/Makefile.target | |
| parent | 17e20537d4c6cdcb55f1ab68c950264c79ca69b2 (diff) | |
| download | netsurf-45906b9dc2c87181f359289abc034f84b44947c4.tar.gz netsurf-45906b9dc2c87181f359289abc034f84b44947c4.tar.bz2 | |
make macro name more correct
Diffstat (limited to 'monkey/Makefile.target')
| -rw-r--r-- | monkey/Makefile.target | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/monkey/Makefile.target b/monkey/Makefile.target index d43fe8d9c..4e8ac81ee 100644 --- a/monkey/Makefile.target +++ b/monkey/Makefile.target @@ -22,17 +22,20 @@ NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0 NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0 # add a line similar to below for each optional pkg-configed lib here -$(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,MOZJS,mozjs185,JavaScript)) -$(eval $(call pkg_config_find_and_add,JS,mozilla-js,JavaScript)) +$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG)) +$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite)) +$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) +$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) +$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG )) +$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) +$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) # no pkg-config for this library $(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp -lvpx,WebP (libwebp))) +#-Wno-unused-but-set-variable +WARNFLAGS += -Werror + MONKEYCFLAGS := -std=c99 -Dmonkey -Dnsmonkey \ -D_BSD_SOURCE \ -D_XOPEN_SOURCE=600 \ @@ -47,19 +50,17 @@ MONKEYCFLAGS := -std=c99 -Dmonkey -Dnsmonkey \ MONKEYLDFLAGS := -lm $(shell $(PKG_CONFIG) --cflags --libs glib-2.0 lcms) -MONKEYWARNFLAGS := -Werror -#-Wno-unused-but-set-variable -CFLAGS += $(MONKEYCFLAGS) $(MONKEYWARNFLAGS) +CFLAGS += $(MONKEYCFLAGS) LDFLAGS += $(MONKEYLDFLAGS) - # --------------------------------------------------------------------------- - # Windows flag setup - # --------------------------------------------------------------------------- +# --------------------------------------------------------------------------- +# Windows flag setup +# --------------------------------------------------------------------------- - ifeq ($(HOST),Windows_NT) - CFLAGS += -U__STRICT_ANSI__ - endif +ifeq ($(HOST),Windows_NT) + CFLAGS += -U__STRICT_ANSI__ +endif # ---------------------------------------------------------------------------- # Source file setup |