diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2012-06-27 23:17:18 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2012-06-27 23:17:18 +0000 |
| commit | 804bec4f99f2880d7cc4a99379c3cca5b1c1d1d4 (patch) | |
| tree | ce1faeb59860ae2f3535da557a5f472b95885c74 /gtk | |
| parent | cfd26609bd15e5e4fef8c72d0abc6c929afd155b (diff) | |
| download | netsurf-804bec4f99f2880d7cc4a99379c3cca5b1c1d1d4.tar.gz netsurf-804bec4f99f2880d7cc4a99379c3cca5b1c1d1d4.tar.bz2 | |
make non js builds compile
make js support compile with older debian/ubuntu packaging
svn path=/trunk/netsurf/; revision=13990
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/Makefile.target | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gtk/Makefile.target b/gtk/Makefile.target index 2e658e6b6..488b8491f 100644 --- a/gtk/Makefile.target +++ b/gtk/Makefile.target @@ -15,6 +15,7 @@ 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 # 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)) @@ -24,11 +25,16 @@ $(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 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))) +ifeq ($(NETSURF_USE_MOZJS),YES) +NETSURF_USE_JS:=YES +endif + # GTK and GLIB flags to disable depricated usage GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \ -DG_DISABLE_DEPRECATED \ |