[SCM] calf/master: + Changed default compiler flags in order to not require an Intel CPU + Fixed syntax error caused by careless commit (duh!)

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1430d105cd3416e9b994976360d178bde5204927
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Sun Dec 9 21:19:49 2007 +0000

    + Changed default compiler flags in order to not require an Intel CPU
    + Fixed syntax error caused by careless commit (duh!)
    
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@11 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/src/Makefile.am b/src/Makefile.am
index 916c6a4..178bbc5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ bin_PROGRAMS =
 noinst_PROGRAMS = calfbenchmark
 noinst_LTLIBRARIES = libcalf.la libcalfstatic.la
 
-AM_CXXFLAGS = -ffast-math -march=pentium4 -finline-limit=80
+AM_CXXFLAGS = -ffast-math -march=i686 -finline-limit=80
 
 if USE_JACK
 AM_CXXFLAGS += -DUSE_JACK=1
diff --git a/src/calf/osc.h b/src/calf/osc.h
index a523e9a..6e85998 100644
--- a/src/calf/osc.h
+++ b/src/calf/osc.h
@@ -108,7 +108,7 @@ struct waveform_family: public map<uint32_t, float *>
         uint32_t multiple = 1, base = 1 << (32 - SIZE_BITS);
         while(multiple < SIZE / 2) {
             float *wf = new float[SIZE];
-            bl.make_waveform(wf, (int)((1 << SIZE_BITS) / (1.5 * multiple));
+            bl.make_waveform(wf, (int)((1 << SIZE_BITS) / (1.5 * multiple)));
             (*this)[base * multiple] = wf;
             multiple = multiple << 1;
         }

-- 
calf audio plugins packaging