summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2012-06-30 09:43:55 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2012-06-30 09:43:55 +0000
commit0f1c918949bd3caac188c21a1d48f9144c8b164a (patch)
tree24069bf8806f2c34011d6100913d294e52a0b1b4
parent8551b9dff030064da3a39be0c54d8114058f1e77 (diff)
downloadnetsurf-0f1c918949bd3caac188c21a1d48f9144c8b164a.tar.gz
netsurf-0f1c918949bd3caac188c21a1d48f9144c8b164a.tar.bz2
Add lines to enable building against Spidermonkey 1.5 or 1.8.5
svn path=/trunk/netsurf/; revision=14015
-rw-r--r--amiga/Makefile.target6
1 files changed, 6 insertions, 0 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index 2930b6952..b0ee7bb5a 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -25,6 +25,8 @@ ifeq ($(HOST),amiga)
$(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng)))
$(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp,WebP (libwebp)))
$(eval $(call feature_enabled,VIDEO,-DWITH_VIDEO -I /SDK/local/newlib/include/glib-2.0,-lgstreamer-0.10 -lglib-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lintl -lffi,Video (libgstreamer)))
+ $(eval $(call feature_enabled,JS,-DXP_UNIX -DWITH_JS -DJS_VERSION=185,-lstdc++ -lmozjs185,JavaScript))
+ $(eval $(call feature_enabled,MOZJS,-DXP_AMIGA -DWITH_MOZJS -DJS_VERSION=150 -DJSVERSION_LATEST=150 -DJSOPTION_JIT=0 -DJSCLASS_GLOBAL_FLAGS=0,-ljs_150 -lfdlibm,JavaScript))
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
$(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
@@ -65,6 +67,10 @@ else
EXETARGET := NetSurf
endif
+ifeq ($(NETSURF_USE_MOZJS),YES)
+ NETSURF_USE_JS:=YES
+endif
+
# ----------------------------------------------------------------------------
# Source file setup
# ----------------------------------------------------------------------------