From e5b0e8bee502e61dfaaf2a5bc4b4d9d4938a9a2a Mon Sep 17 00:00:00 2001 From: WANG Date: Mon, 9 Sep 2013 10:40:40 +0200 Subject: [PATCH] Add /usr/local/lib/faustine and /usr/lib/faustine to preprocessor import path. Correct the paths in examples. --- examples/2d_fft/fft2d.dsp | 4 ++-- examples/2d_fft/fft2d.sh | 2 +- examples/close/close.dsp | 4 ++-- examples/close/close.sh | 2 +- examples/dilation/dilation.dsp | 2 +- examples/dilation/dilation.sh | 2 +- examples/erosion/erosion.dsp | 4 ++-- examples/erosion/erosion.sh | 2 +- examples/fft/fft.dsp | 4 ++-- examples/fft/fft.sh | 2 +- examples/licenseplate/licenceplate.dsp | 2 +- examples/licenseplate/licenceplate.sh | 2 +- examples/open/open.dsp | 4 ++-- examples/open/open.sh | 2 +- examples/sinwave/output1.wav | Bin 393254 -> 131114 bytes .../compiler/parser/enrobage.cpp | 17 +++++++++++++++++ 16 files changed, 36 insertions(+), 19 deletions(-) diff --git a/examples/2d_fft/fft2d.dsp b/examples/2d_fft/fft2d.dsp index c77a660..09fff6d 100644 --- a/examples/2d_fft/fft2d.dsp +++ b/examples/2d_fft/fft2d.dsp @@ -1,5 +1,5 @@ -import ( "../../architecture/fft.lib" ) ; -import ( "../../architecture/complex.lib" ) ; +import ( "fft.lib" ) ; +import ( "complex.lib" ) ; GREY_MAX = 256; diff --git a/examples/2d_fft/fft2d.sh b/examples/2d_fft/fft2d.sh index b77b205..fe18645 100644 --- a/examples/2d_fft/fft2d.sh +++ b/examples/2d_fft/fft2d.sh @@ -1,2 +1,2 @@ -../../interpretor/faustine -d fft2d.dsp -i hcosine-32.csv --oformat csv +faustine -d fft2d.dsp -i hcosine-32.csv --oformat csv diff --git a/examples/close/close.dsp b/examples/close/close.dsp index 8e283a5..e68d28c 100644 --- a/examples/close/close.dsp +++ b/examples/close/close.dsp @@ -1,3 +1,3 @@ -import ("../../architecture/morph.lib"); +import ("morpho.lib"); -process = close(119, 123, 2); +process = closing_square(119, 123, 2); diff --git a/examples/close/close.sh b/examples/close/close.sh index 7887cbf..5179de8 100644 --- a/examples/close/close.sh +++ b/examples/close/close.sh @@ -1 +1 @@ -../../interpretor/faustine -d close.dsp -i circbw.csv --oformat csv +faustine -d close.dsp -i circbw.csv --oformat csv diff --git a/examples/dilation/dilation.dsp b/examples/dilation/dilation.dsp index 42b9181..2ea985e 100644 --- a/examples/dilation/dilation.dsp +++ b/examples/dilation/dilation.dsp @@ -1,3 +1,3 @@ -import ("../../architecture/morpho.lib"); +import ("morpho.lib"); process = dilations_square(112, 150, 2); diff --git a/examples/dilation/dilation.sh b/examples/dilation/dilation.sh index 5eed92b..b1e18a5 100644 --- a/examples/dilation/dilation.sh +++ b/examples/dilation/dilation.sh @@ -1 +1 @@ -../../interpretor/faustine -d dilation.dsp -i letter_j.csv -t 150 --oformat csv +faustine -d dilation.dsp -i letter_j.csv -t 150 --oformat csv diff --git a/examples/erosion/erosion.dsp b/examples/erosion/erosion.dsp index 45c4ffb..79389dd 100644 --- a/examples/erosion/erosion.dsp +++ b/examples/erosion/erosion.dsp @@ -1,3 +1,3 @@ -import ("../../architecture/morph.lib"); +import ("morpho.lib"); -process = erosions(112, 150, 2); +process = erosions_square(112, 150, 2); diff --git a/examples/erosion/erosion.sh b/examples/erosion/erosion.sh index f196796..e905f8b 100644 --- a/examples/erosion/erosion.sh +++ b/examples/erosion/erosion.sh @@ -1 +1 @@ -../../interpretor/faustine -d erosion.dsp -i letter_j.csv --oformat csv +faustine -d erosion.dsp -i letter_j.csv --oformat csv diff --git a/examples/fft/fft.dsp b/examples/fft/fft.dsp index 41ad1fe..90f97a1 100644 --- a/examples/fft/fft.dsp +++ b/examples/fft/fft.dsp @@ -1,5 +1,5 @@ -import ( "../../architecture/fft.lib" ) ; -import ( "../../architecture/complex.lib" ) ; +import ("fft.lib"); +import ("complex.lib"); diff --git a/examples/fft/fft.sh b/examples/fft/fft.sh index 03de52b..8bec578 100644 --- a/examples/fft/fft.sh +++ b/examples/fft/fft.sh @@ -1 +1 @@ -../../interpretor/faustine -d fft.dsp -i sin_22000Hz_0.005_ampli_128samples.wav +faustine -d fft.dsp -i sin_22000Hz_0.005_ampli_128samples.wav diff --git a/examples/licenseplate/licenceplate.dsp b/examples/licenseplate/licenceplate.dsp index 2d230c3..f012d4a 100644 --- a/examples/licenseplate/licenceplate.dsp +++ b/examples/licenseplate/licenceplate.dsp @@ -1,4 +1,4 @@ -import ("../../architecture/morpho.lib"); +import ("morpho.lib"); process = licenceplate(300, 100, 15, 8, 1, 50, 150, 255, 4, 4, 2); diff --git a/examples/licenseplate/licenceplate.sh b/examples/licenseplate/licenceplate.sh index 01e40c8..5380d87 100644 --- a/examples/licenseplate/licenceplate.sh +++ b/examples/licenseplate/licenceplate.sh @@ -1 +1 @@ -../../interpretor/faustine -d licenceplate.dsp -i licence.csv -t 383 --oformat csv +faustine -d licenceplate.dsp -i licence.csv -t 383 --oformat csv diff --git a/examples/open/open.dsp b/examples/open/open.dsp index 7c7445b..00e155d 100644 --- a/examples/open/open.dsp +++ b/examples/open/open.dsp @@ -1,3 +1,3 @@ -import ("../../architecture/morpho.lib"); +import ("morpho.lib"); -process = open(119, 123, 2); +process = opening_square(119, 123, 2); diff --git a/examples/open/open.sh b/examples/open/open.sh index 805dbff..fe6b7a5 100644 --- a/examples/open/open.sh +++ b/examples/open/open.sh @@ -1 +1 @@ -../../interpretor/faustine -d open.dsp -i circbw.csv -t 123 --oformat csv +faustine -d open.dsp -i circbw.csv -t 123 --oformat csv diff --git a/examples/sinwave/output1.wav b/examples/sinwave/output1.wav index f0196969f1a7273214c4a06fcaff5639cdd4ee40..5a728e2cca463cca0edf2c8809f3d1fd42fa0231 100644 GIT binary patch delta 38 ucmZ41AhD`}gFVR8%}t4cX(GEK+rR&e3=9m-3z)YrU}o(4vpGSkh#3Ino(w4f delta 72 xcmZ40z_F}Bf<4I7%}tJhZ6doO+pqtu3=9m-3z)YrU}o(4vpGSkh?$9?002G67k>Z% diff --git a/interpretor/preprocessor/faust-0.9.47mr3/compiler/parser/enrobage.cpp b/interpretor/preprocessor/faust-0.9.47mr3/compiler/parser/enrobage.cpp index 2d1599b..59e6fb5 100644 --- a/interpretor/preprocessor/faust-0.9.47mr3/compiler/parser/enrobage.cpp +++ b/interpretor/preprocessor/faust-0.9.47mr3/compiler/parser/enrobage.cpp @@ -406,6 +406,23 @@ FILE* fopensearch(const char* filename, string& fullpath) if ((f = fopenat(fullpath, gFaustSuperSuperDirectory, "architecture", filename))) { return f; } + + /* Faustine directories (Haisheng WANG 09/2013) */ + +#ifdef INSTALL_PREFIX + if ((f = fopenat(fullpath, INSTALL_PREFIX "/lib/faustine", filename))) { + return f; + } +#endif + if ((f = fopenat(fullpath, "/usr/local/lib/faustine", filename))) { + return f; + } + if ((f = fopenat(fullpath, "/usr/lib/faustine", filename))) { + return f; + } + + /* End of Faustine directories */ + #ifdef INSTALL_PREFIX if ((f = fopenat(fullpath, INSTALL_PREFIX "/lib/faust", filename))) { return f; -- 2.20.1