From: WANG Date: Thu, 22 Aug 2013 15:34:50 +0000 (+0200) Subject: Merge branch 'OOP' X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/commitdiff_plain/8c48d01c4b78dba6159c13438b06cb7e07a1f338?hp=-c Merge branch 'OOP' Conflicts: Makefile Makefile.in interpretor/faust-0.9.47mr3/compiler/faust interpretor/faust-0.9.47mr3/compiler/preprocess.a interpretor/faust-0.9.47mr3/compiler/preprocess/preprocess.o interpretor/faustine interpretor/gmon.out --- 8c48d01c4b78dba6159c13438b06cb7e07a1f338 diff --combined Makefile index 0a0a5a7,9eb9354..0000000 deleted file mode 100644,100644 --- a/Makefile +++ /dev/null @@@ -1,38 -1,23 +1,0 @@@ - SRC_DIR = interpretor - PREPROCESSOR_DIR = $(SRC_DIR)/faust-0.9.47mr3 - OUTPUTSOUNDS_DIR = output_sounds - EXEC = faustine -- - all: $(EXEC) -SOURCE_DIR = interpretor -PREPROCESSOR_DIR = $(SOURCE_DIR)/faust-0.9.47mr3 -- - faustine: - @cp $(SNDFILE_PATH)/sndfile_stub.o $(SRC_DIR) - @cd $(SRC_DIR) && $(MAKE) opt OCAML_INCLUDE_PATH=$(OCAML_INCLUDE_PATH) SNDFILE_PATH=$(SNDFILE_PATH) - @cd $(SRC_DIR) && $(MAKE) clean -all: Faustine -- - .PHONY: clean mrproper -Faustine: - @(cp $(SNDFILE_PATH)/sndfile_stub.o $(SOURCE_DIR)) - @(cd $(SOURCE_DIR) && $(MAKE) opt OCAML_INCLUDE_PATH=$(OCAML_INCLUDE_PATH) SNDFILE_PATH=$(SNDFILE_PATH)) - @(cd $(SOURCE_DIR) && $(MAKE) clean) -- --clean: - @(cd $(SRC_DIR) && $(MAKE) clean) - @(cd $(SOURCE_DIR) && $(MAKE) clean) -- @(rm -f *~) -- --mrproper: clean - @(cd $(SRC_DIR) && $(MAKE) mrproper) - @(cd $(SOURCE_DIR) && $(MAKE) mrproper) -- @(cd $(PREPROCESSOR_DIR) && $(MAKE) clean) - - test: - @rm -f $(OUTPUTSOUNDS_DIR)/output0.wav - @cd $(SRC_DIR) && ./faustine -csv -wav ../dsp_files/sin.dsp - @ls -l $(OUTPUTSOUNDS_DIR)/output0.wav - - @echo " You might want to check the output file with either:" - @echo "audacity ../output_sounds/output0.wav" - @echo "open ../output_sounds/output0.wav" - @echo "octave -q --eval 'plot(wavread(\"output_sounds/output0.wav\")); pause'" -- - # Library paths for OCaml and libsndfile-ocaml - # OCAML_INCLUDE_PATH - # SNDFILE_PATH -# Sndfile-ocaml library path -- - OCAML_INCLUDE_PATH = /usr/local/lib/ocaml - SNDFILE_PATH = ~/Boulot/2013-07-CRI/lib/libsndfile-ocaml -OCAML_INCLUDE_PATH = /usr/lib/ocaml -SNDFILE_PATH = ~/Desktop/libsndfile-ocaml diff --combined Makefile.in index 81ef8f0,a6e557b..c27a93f --- a/Makefile.in +++ b/Makefile.in @@@ -1,36 -1,21 +1,35 @@@ +SRC_DIR = interpretor +PREPROCESSOR_DIR = $(SRC_DIR)/faust-0.9.47mr3 +OUTPUTSOUNDS_DIR = output_sounds +EXEC = faustine -SOURCE_DIR = interpretor -PREPROCESSOR_DIR = $(SOURCE_DIR)/faust-0.9.47mr3 +all: $(EXEC) -all: Faustine +faustine: + @cp $(SNDFILE_PATH)/sndfile_stub.o $(SRC_DIR) + @cd $(SRC_DIR) && $(MAKE) opt OCAML_INCLUDE_PATH=$(OCAML_INCLUDE_PATH) SNDFILE_PATH=$(SNDFILE_PATH) + @cd $(SRC_DIR) && $(MAKE) clean -Faustine: - @(cp $(SNDFILE_PATH)/sndfile_stub.o $(SOURCE_DIR)) - @(cd $(SOURCE_DIR) && $(MAKE) opt OCAML_INCLUDE_PATH=$(OCAML_INCLUDE_PATH) SNDFILE_PATH=$(SNDFILE_PATH)) - @(cd $(SOURCE_DIR) && $(MAKE) clean) +.PHONY: clean mrproper clean: - @(cd $(SOURCE_DIR) && $(MAKE) clean) + @(cd $(SRC_DIR) && $(MAKE) clean) @(rm -f *~) mrproper: clean - @(cd $(SOURCE_DIR) && $(MAKE) mrproper) + @(cd $(SRC_DIR) && $(MAKE) mrproper) @(cd $(PREPROCESSOR_DIR) && $(MAKE) clean) -# Sndfile-ocaml library path +test: + @rm -f $(OUTPUTSOUNDS_DIR)/output0.wav + @cd $(SRC_DIR) && ./faustine -csv -wav ../dsp_files/sin.dsp + @ls -l $(OUTPUTSOUNDS_DIR)/output0.wav + @echo " You might want to check the output file with either:" + @echo "audacity ../output_sounds/output0.wav" + @echo "open ../output_sounds/output0.wav" + @echo "octave -q --eval 'plot(wavread(\"output_sounds/output0.wav\")); pause'" + +# Library paths for OCaml and libsndfile-ocaml +# OCAML_INCLUDE_PATH +# SNDFILE_PATH - diff --combined interpretor/faust-0.9.47mr3/compiler/preprocess.a index 422ad78,8a4962e..0000000 deleted file mode 100644,100644 Binary files differ diff --combined interpretor/faust-0.9.47mr3/compiler/preprocess/preprocess.o index 7663721,0c97dae..0000000 deleted file mode 100644,100644 Binary files differ