X-Git-Url: https://svn.cri.ensmp.fr/git/Faustine.git/blobdiff_plain/66f23d4fabf89ad09adbd4dfc15ac6b5b2b7da83..4745d0cba82b458d491320c72e564b23899a5310:/interpreter/Makefile?ds=inline

diff --git a/interpreter/Makefile b/interpreter/Makefile
index 715aadc..e6d1d0e 100644
--- a/interpreter/Makefile
+++ b/interpreter/Makefile
@@ -4,7 +4,7 @@
 #
 # The Caml sources (including camlyacc and camllex source files)
 
-SOURCES = types.ml parser.mly lexer.mll aux.ml basic.ml symbol.ml value.ml signal.ml beam.ml process.ml faustio.ml preprocess.ml main.ml preprocess_stubs.cpp
+SOURCES = types.ml parser.mly lexer.mll nstparser.mly nstlexer.mll aux.ml basic.ml nest.ml symbol.ml value.ml signal.ml beam.ml process.ml faustio.ml preprocess.ml main.ml preprocess_stubs.cpp
 
 # The executable file to generate
 EXEC = faustine
@@ -27,7 +27,13 @@ PREPROCESSOR_PATH = $(FAUST_PATH)/compiler
 # Path to preprocessor header files
 PREPROCESSOR_INCLUDE_PATH = $(PREPROCESSOR_PATH)/headers
 
-# Path to the interpretor documentation
+# Path to preprocessor cpp files
+PREPROCESSOR_SRC = $(wildcard $(PREPROCESSOR_PATH)/*/*.cpp) $(wildcard $(PREPROCESSOR_PATH)/draw/*/*.cpp)
+
+# Path to preprocessor obj files
+PREPROCESSOR_OBJ = $(PREPROCESSOR_SRC:.cpp=.o)
+
+# Path to the interpreter documentation
 OCAML_DOC_PATH = ../documentation
 
 ########################## Advanced user's variables #####################
@@ -122,7 +128,8 @@ OPTOBJS = $(OBJS:.cmo=.cmx)
 
 CSOURCES = $(filter %.cpp, $(SOURCES))
 COBJS = $(CSOURCES:.cpp=.o)
-CLIBS = $(PREPROCESSOR_PATH)/preprocess.a
+#CLIBS = $(PREPROCESSOR_PATH)/preprocess.a
+CLIBS = $(PREPROCESSOR_OBJ)
 
 PARSER_MLY = $(filter %.mly, $(SOURCES))
 LEXER_MLL = $(filter %.mll, $(SOURCES))