scilab: add SCRDIR as include dir + scilab needs absolute include paths

This commit is contained in:
Simon Marchetto 2014-06-10 16:32:45 +02:00
commit 8dc3b59216
2 changed files with 6 additions and 2 deletions

View file

@ -1710,10 +1710,13 @@ SCILAB_OPT = @SCILABOPT@
define get_swig_scilab_args define get_swig_scilab_args
SWIG_SCILAB_ARGS := -scilab SWIG_SCILAB_ARGS := -scilab
ifdef SRCS ifdef SRCS
SWIG_SCILAB_ARGS += -addsrc "$(SRCDIR_SRCS)" SWIG_SCILAB_ARGS += -addsrc "$(SRCDIR_SRCS)"
endif endif
ifdef INCLUDES ifdef INCLUDES
SWIG_SCILAB_ARGS += -addcflag "$(INCLUDES)" SWIG_SCILAB_ARGS += -addcflag "-I$(abspath $(INCLUDES))"
endif
ifdef SRCDIR
SWIG_SCILAB_ARGS += -addcflag "-I$(abspath $(SRCDIR))"
endif endif
endef endef

View file

@ -31,6 +31,7 @@ include $(srcdir)/../common.mk
# overriden variables # overriden variables
SRCDIR = ../$(srcdir)/ SRCDIR = ../$(srcdir)/
SCRIPTDIR = . SCRIPTDIR = .
INCLUDES = $(abspath ../$(srcdir))
# local variables # local variables
TEST_DIR = $*.dir TEST_DIR = $*.dir