diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2015-08-09 12:27:28 +0100 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2015-08-09 12:27:28 +0100 |
commit | a16e2aa8393833883e8f2d5e38833784d68d142d (patch) | |
tree | dfec9e02654344ab02b3cfe04f983cd5647443ba | |
parent | 061472e520596507efa45112f9c9da52a15603d1 (diff) | |
download | netsurf-a16e2aa8393833883e8f2d5e38833784d68d142d.tar.gz netsurf-a16e2aa8393833883e8f2d5e38833784d68d142d.tar.bz2 |
Make duktape the default, and on by default, and others off by default
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | Makefile.defaults | 6 |
2 files changed, 8 insertions, 6 deletions
@@ -498,6 +498,7 @@ include Makefile.defaults $(eval $(call feature_switch,JPEG,JPEG (libjpeg),-DWITH_JPEG,-ljpeg,-UWITH_JPEG,)) $(eval $(call feature_switch,HARU_PDF,PDF export (haru),-DWITH_PDF_EXPORT,-lhpdf -lpng,-UWITH_PDF_EXPORT,)) $(eval $(call feature_switch,LIBICONV_PLUG,glibc internal iconv,-DLIBICONV_PLUG,,-ULIBICONV_PLUG,-liconv)) +$(eval $(call feature_switch,DUKTAPE,Javascript (Duktape),,,,,)) # Common libraries with pkgconfig $(eval $(call pkg_config_find_and_add,libcss,CSS)) @@ -526,17 +527,17 @@ CXXFLAGS += -DNETSURF_HOMEPAGE=\"$(NETSURF_HOMEPAGE)\" $(OBJROOT)/created: $(VQ)echo " MKDIR: $(OBJROOT)" - $(Q)$(MKDIR) $(OBJROOT) + $(Q)$(MKDIR) -p $(OBJROOT) $(Q)$(TOUCH) $(OBJROOT)/created $(DEPROOT)/created: $(OBJROOT)/created $(VQ)echo " MKDIR: $(DEPROOT)" - $(Q)$(MKDIR) $(DEPROOT) + $(Q)$(MKDIR) -p $(DEPROOT) $(Q)$(TOUCH) $(DEPROOT)/created $(TOOLROOT)/created: $(OBJROOT)/created $(VQ)echo " MKDIR: $(TOOLROOT)" - $(Q)$(MKDIR) $(TOOLROOT) + $(Q)$(MKDIR) -p $(TOOLROOT) $(Q)$(TOUCH) $(TOOLROOT)/created CLEANS := @@ -782,7 +783,6 @@ $(eval $(foreach SOURCE,$(filter %.m,$(SOURCES)), \ ifeq ($(filter $(MAKECMDGOALS),clean test coverage),) -include $(sort $(addprefix $(DEPROOT)/,$(DEPFILES))) --include $(D_JSAPI_BINDING) endif # And rules to build the objects themselves... diff --git a/Makefile.defaults b/Makefile.defaults index e2d799950..09ac2243e 100644 --- a/Makefile.defaults +++ b/Makefile.defaults @@ -53,9 +53,11 @@ NETSURF_USE_VIDEO := NO # Enable NetSurf's use of spidermonkey for javascript # Valid options: YES, NO, AUTO -NETSURF_USE_JS := AUTO +NETSURF_USE_JS := NO # Javascript support in older debian/ubuntu versions -NETSURF_USE_MOZJS := AUTO +NETSURF_USE_MOZJS := NO +# Or use duktape +NETSURF_USE_DUKTAPE := YES # Enable NetSurf's use of libharu for PDF export and GTK printing support. # There is no auto-detection available for this, as it does not have a |