Add /usr/local/lib/faustine and /usr/lib/faustine to preprocessor import path.

Correct the paths in examples.

diff --git a/examples/2d_fft/fft2d.dsp b/examples/2d_fft/fft2d.dsp
index c77a6607ff0f4bbc920f3a5aed3a9f07ad080970..09fff6d5838a07929c5c73dce96d137c53048895 100644 (file)
--- 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 b77b20576dfd92af24603746fb8be4ff2335070b..fe186451baeb2ae6a499eb50ae812215b09cbe90 100644 (file)
--- 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 8e283a53a50c3d01f912b115722bbaa89d418e9c..e68d28cb88a3f9a5139396cd5be047bcbbdcf33f 100644 (file)
--- 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 7887cbf6bee1e165fe0474d14eb168300d7de821..5179de8f977a4a601e634a4b5fad8f465b4a71ec 100644 (file)
--- 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 42b91812a2489ad93c11e28f0968a142d24dae31..2ea985ed97f6807d12c67aff7cfb4dc11b635ec5 100644 (file)
--- 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 5eed92b7512d52c93aef68a2d33b269cf42e150d..b1e18a554a36d74443cf2854256a08473d156507 100644 (file)
--- 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 45c4ffb43bfb1495c34338ece51c5cdb692ce33e..79389dd6f43e3456e7ac5e900f2757638c8aaf7b 100644 (file)
--- 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 f19679621a34db56d92c314feb8d8ff8e1dffe1b..e905f8b06135a46782b4ac1fdde6ef34d19e31b9 100644 (file)
--- 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 41ad1fe25574a5905937a5f8432f67eb7b387aa5..90f97a10e9968b9bcc708828f1f1c0b57563286a 100644 (file)
--- 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 03de52b23054062299ead0fc1007c45c5b976402..8bec57875714ce194d322a62c62508b9f8b7a9f0 100644 (file)
--- 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 2d230c3ce9c77560c265ca970092020fd08dff6f..f012d4a0003df8c0e5bdc6570e1966563bb18905 100644 (file)
--- 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 01e40c83b16735bc65ab0e8211db56b2853a06ff..5380d87099fef91462336b641d97ce0028a0e80c 100644 (file)
--- 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 7c7445b37cdfe4dd619ea93792ebc2b921e24980..00e155dd0e4f4a59c82e8122779d09e131453e9d 100644 (file)
--- 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 805dbffb5084750138f13fdd85ff125f9773b2af..fe6b7a50d79e4954502813ecc9e3bf65fa8314ef 100644 (file)
--- 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 (file)
Binary files a/examples/sinwave/output1.wav and b/examples/sinwave/output1.wav differ

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 2d1599bb997ae30833b552aee296b68675ba8c55..59e6fb546791f235021f16833afb9a7d16f8881c 100644 (file)
--- 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;