X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/blobdiff_plain/a891a827a9bad83d44164ffdd7b28f070c439e46..a186a0b2f3c996e9f17dd96e9f548e81f6447fe0:/interpretor/Makefile?ds=sidebyside diff --git a/interpretor/Makefile b/interpretor/Makefile index 23b74e4..3a35e1c 100644 --- a/interpretor/Makefile +++ b/interpretor/Makefile @@ -16,7 +16,7 @@ export OCAML_INCLUDE_PATH export SNDFILE_PATH # Path to Faust.mr2 -FAUST_PATH = faust-0.9.47mr3 +FAUST_PATH = preprocessor/faust-0.9.47mr3 # Path to preprocessor library PREPROCESSOR_PATH = $(FAUST_PATH)/compiler @@ -45,7 +45,7 @@ CC = g++ # LIBS=$(WITHGRAPHICS) $(WITHUNIX) $(WITHSTR) $(WITHNUMS) $(WITHTHREADS)\ # $(WITHDBM) -LIBS = $(WITHSNDFILE) $(WITHUNIX) +LIBS = $(WITHSNDFILE) $(WITHUNIX) $(WITHSTR) # Should be set to -INCLUDE if you use any of the libraries above # or if any C code have to be linked with your program @@ -73,6 +73,8 @@ WITHUNIX =unix.cma WITHSNDFILE = sndfile.cma +WITHSTR = str.cma + # c++ wrap options GPP_CALL = -cc "g++" @@ -119,13 +121,14 @@ PARSER_MLY = $(filter %.mly, $(SOURCES)) LEXER_MLL = $(filter %.mll, $(SOURCES)) MIDDLE_ML = $(PARSER_MLY:.mly=.ml) $(LEXER_MLL:.mll=.ml) -preprocessor: - @(cd $(FAUST_PATH) && $(MAKE)) +preprocessor:: + echo "Compling preprocessor..." + cd $(FAUST_PATH) && $(MAKE) -$(EXEC): $(OBJS) $(COBJS) +$(EXEC): $(OBJS) $(COBJS) $(CLIBS) $(CAMLC) $(CAMLC_OPTIONS) -o $(EXEC) $(OBJS) $(COBJS) $(CLIBS) -$(EXEC).opt: $(OPTOBJS) $(COBJS) +$(EXEC).opt: $(OPTOBJS) $(COBJS) $(CLIBS) $(CAMLOPT) $(CAMLOPT_OPTIONS) -o $(EXEC) $(OPTOBJS) $(COBJS) $(CLIBS) document: $(SMLYL) $(OBJS) @@ -146,6 +149,12 @@ preprocess.cmx: preprocess.ml preprocess_stubs.o: preprocess_stubs.cpp $(CC) $(CC_OPTIONS) $< +faustio.cmo: faustio.ml + $(CAMLC) $(INCLUDE) $(LIBS) -c $< + +faustio.cmx: faustio.ml + $(CAMLOPT) $(INCLUDE) $(LIBS:.cma=.cmxa) -c $< + .SUFFIXES: .ml .mli .cmo .cmi .cmx .mll .mly .ml.cmo: