jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update configuration to detect V8 and allow testing with V8.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/oliverb-javascript-v8@13777 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Oliver Buchtala 2012-09-08 01:01:41 +00:00
commit 548287c600
15 changed files with 159 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Examples/Makefile.in
View file

@ -519,10 +519,22 @@ java_clean:
# You need to set this variable to the jscore[or other javascript engine] directories containing the
# files "JavaScript.h" and others
JS_INCLUDE= @JSCOREINC@
ifeq (,$(V8))
JS_INCLUDE = @JSCOREINC@
JS_DLNK = @JSCOREDYNAMICLINKING@
else
JS_INCLUDE = @JSV8INC@
JS_DLNK = @JSCOREDYNAMICLINKING@
endif
ifeq (,$(V8))
SWIGJS = $(SWIG) -javascript -jsc
else
SWIGJS = $(SWIG) -javascript -v8
endif
# Extra JAVASCRIPT specific dynamic linking options
JS_DLNK = @JSCOREDYNAMICLINKING@
JS_LIBPREFIX = @JSCORELIBRARYPREFIX@
JSSO =@JSCORESO@
JSLDSHARED = @JSCORELDSHARED@
@ -535,7 +547,7 @@ JSCXXFLAGS = @JSCXXFLAGS@
# ----------------------------------------------------------------
javascript: $(SRCS)
$(SWIG) -javascript -jsc -debug-codetemplates $(SWIGOPT) $(INTERFACEPATH)
$(SWIGJS) $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(JSCFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(JS_INCLUDE)
$(JSLDSHARED) $(CCSHARED) $(JSCFLAGS) $(OBJS) $(IOBJS) $(JS_DLNK) $(LIBS) -o $(JS_LIBPREFIX)$(TARGET)$(JSSO)
@ -544,7 +556,7 @@ javascript: $(SRCS)
# ----------------------------------------------------------------
javascript_cpp: $(SRCS)
$(SWIG) -c++ -javascript -jsc -debug-codetemplates $(SWIGOPT) $(INTERFACEPATH)
$(SWIGJS) -c++ $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(JSCXXFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JS_INCLUDE)
$(JSCXXSHARED) $(CCSHARED) $(OBJS) $(IOBJS) $(JS_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JS_LIBPREFIX)$(TARGET)$(JSSO)
@ -559,7 +571,7 @@ javascript_exe: $(SRCS)
# ----------------------------------------------------------------
javascript_run: $(SRCS)
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(JAVASCRIPT_EXE) -l $(JAVASCRIPT_MODULE) $(JS_SCRIPT)
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(JAVASCRIPT_EXE) -l $(TARGET) $(JS_SCRIPT)
# -----------------------------------------------------------------
# Cleaning the javascript examples