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

Minor change in javascript example Makefile configuration.

Browse source 
Propagate global CFLAGS and CXXFLAGS to inner javascript targets.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/oliverb-javascript-v8@13823 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Oliver Buchtala 2012-09-08 01:14:48 +00:00
commit 296a5d0285
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Examples/Makefile.in
View file

@ -543,8 +543,7 @@ JSCFLAGS = @JSCORECFLAGS@
JSCXXFLAGS = @JSCXXFLAGS@ JSCXXFLAGS = @JSCXXFLAGS@
JSEXE_SRC_DIR = $(TOP)/../Tools/javascript JSEXE_SRC_DIR = $(TOP)/../Tools/javascript
JSEXE_SRC = $(JSEXE_SRC_DIR)/javascript.cxx $(JSEXE_SRC_DIR)/js_shell.cxx JSEXE = $(JSEXE_SRC_DIR)/javascript
JSEXE = $(TOP)/../Tools/javascript/javascript
ifeq (,$(V8)) ifeq (,$(V8))
JSEXE_SRC = $(JSEXE_SRC_DIR)/javascript.cxx $(JSEXE_SRC_DIR)/js_shell.cxx $(JSEXE_SRC_DIR)/jsc_shell.cxx JSEXE_SRC = $(JSEXE_SRC_DIR)/javascript.cxx $(JSEXE_SRC_DIR)/js_shell.cxx $(JSEXE_SRC_DIR)/jsc_shell.cxx
JSEXE_OPTS = -jsc JSEXE_OPTS = -jsc
@ -563,8 +562,8 @@ endif
ifeq (,$(V8)) ifeq (,$(V8))
javascript: $(SRCS) javascript: $(SRCS)
$(SWIGJS) $(SWIGOPT) $(INTERFACEPATH) $(SWIGJS) $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(JSCFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(JS_INCLUDE) $(CC) -c $(CCSHARED) $(CFLAGS) $(JSCFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(JS_INCLUDE)
$(JSLDSHARED) $(CCSHARED) $(JSCFLAGS) $(OBJS) $(IOBJS) $(JS_DLNK) $(LIBS) -o $(JS_LIBPREFIX)$(TARGET)$(JSSO) $(JSLDSHARED) $(CCSHARED) $(OBJS) $(IOBJS) $(JS_DLNK) $(LIBS) -o $(JS_LIBPREFIX)$(TARGET)$(JSSO)
else else
javascript: $(SRCS) javascript_cpp javascript: $(SRCS) javascript_cpp
endif endif
@ -575,7 +574,7 @@ endif
javascript_cpp: $(SRCS) javascript_cpp: $(SRCS)
$(SWIGJS) -c++ $(SWIGOPT) $(INTERFACEPATH) $(SWIGJS) -c++ $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(JSCXXFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JS_INCLUDE) $(CXX) -c $(CCSHARED) $(CXXFLAGS) $(JSCXXFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JS_INCLUDE)
$(JSCXXSHARED) $(CCSHARED) $(OBJS) $(IOBJS) $(JS_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JS_LIBPREFIX)$(TARGET)$(JSSO) $(JSCXXSHARED) $(CCSHARED) $(OBJS) $(IOBJS) $(JS_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JS_LIBPREFIX)$(TARGET)$(JSSO)
# ---------------------------------------------------------------- # ----------------------------------------------------------------