Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/5a5451a0c58903fe5b059... ...commit http://git.netsurf-browser.org/netsurf.git/commit/5a5451a0c58903fe5b0590e... ...tree http://git.netsurf-browser.org/netsurf.git/tree/5a5451a0c58903fe5b0590e01... The branch, master has been updated via 5a5451a0c58903fe5b0590e01a0f06e53c44787d (commit) via 25e85f1429971a13b5f063c65781a73952e0bfcf (commit) from 1b4604130ebd636df5b932134d651408f35015d7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/5a5451a0c58903fe5b0... commit 5a5451a0c58903fe5b0590e01a0f06e53c44787d Author: Vincent Sanders <vince(a)netsurf-browser.org&gt; Commit: Vincent Sanders <vince(a)netsurf-browser.org&gt; make monkey target take notice of GCCSDK_INSTALL_ENV and GCCSDK_INSTALL_CROSSBIN environment values diff --git a/Makefile b/Makefile index 7b823ac..9cfc484 100644 --- a/Makefile +++ b/Makefile @@ -260,8 +260,21 @@ else endif endif else - # Building for GTK, Framebuffer - PKG_CONFIG := pkg-config + ifeq ($(TARGET),monkey) + ifeq ($(origin GCCSDK_INSTALL_ENV),undefined) + PKG_CONFIG := pkg-config + else + PKG_CONFIG := PKG_CONFIG_LIBDIR="$(GCCSDK_INSTALL_ENV)/lib/pkgconfig" pkg-config + endif + + ifneq ($(origin GCCSDK_INSTALL_CROSSBIN),undefined) + CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) + CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++) + endif + else + # All other targets (GTK, Framebuffer) + PKG_CONFIG := pkg-config + endif endif endif endif commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/25e85f1429971a13b5f... commit 25e85f1429971a13b5f063c65781a73952e0bfcf Author: Vincent Sanders <vince(a)netsurf-browser.org&gt; Commit: Vincent Sanders <vince(a)netsurf-browser.org&gt; do not add script handler if runtime cannot be initialised diff --git a/javascript/jsapi.c b/javascript/jsapi.c index 73153fe..ef34371 100644 --- a/javascript/jsapi.c +++ b/javascript/jsapi.c @@ -38,8 +38,10 @@ void js_initialise(void) rt = JS_NewRuntime(8L * 1024L * 1024L); JSLOG("New runtime handle %p", rt); - /* register script content handler */ - javascript_init(); + if (rt != NULL) { + /* register script content handler */ + javascript_init(); + } } void js_finalise(void) ----------------------------------------------------------------------- Summary of changes: Makefile | 17 +++++++++++++++-- javascript/jsapi.c | 6 ++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7b823ac..9cfc484 100644 --- a/Makefile +++ b/Makefile @@ -260,8 +260,21 @@ else endif endif else - # Building for GTK, Framebuffer - PKG_CONFIG := pkg-config + ifeq ($(TARGET),monkey) + ifeq ($(origin GCCSDK_INSTALL_ENV),undefined) + PKG_CONFIG := pkg-config + else + PKG_CONFIG := PKG_CONFIG_LIBDIR="$(GCCSDK_INSTALL_ENV)/lib/pkgconfig" pkg-config + endif + + ifneq ($(origin GCCSDK_INSTALL_CROSSBIN),undefined) + CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) + CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++) + endif + else + # All other targets (GTK, Framebuffer) + PKG_CONFIG := pkg-config + endif endif endif endif diff --git a/javascript/jsapi.c b/javascript/jsapi.c index 73153fe..ef34371 100644 --- a/javascript/jsapi.c +++ b/javascript/jsapi.c @@ -38,8 +38,10 @@ void js_initialise(void) rt = JS_NewRuntime(8L * 1024L * 1024L); JSLOG("New runtime handle %p", rt); - /* register script content handler */ - javascript_init(); + if (rt != NULL) { + /* register script content handler */ + javascript_init(); + } } void js_finalise(void) -- NetSurf Browser