paulstretch_cpp

commit 7f5c3993abe420661ea0b808304b0e2b4b0048c5
parent e1b05188339e4ef42d43c95f818f82cf8a8083b9
Author: Nasca Octavian PAUL <zynaddsubfx@yahoo.com>
Date:   Tue,  5 Nov 2013 10:34:45 +0200

Bugfixes:
 - small error on GUI (reported by David Binderman)
 - vorbis compilation fixes on Linux

Diffstat:
M
GUI.fl
 | 
4
++--
M
compile_linux_fftw.sh
 | 
2
+-
M
compile_linux_fftw_jack.sh
 | 
2
+-
M
compile_linux_kissfft.sh
 | 
2
+-

4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/GUI.fl b/GUI.fl
@@ -45,8 +45,8 @@ decl {\#include "version.h"} {public
 Function {hex4n(char c)} {return_type int
 } {
   code {if (c>96) c-=32;
-if ((c>='0')||(c<='9')) return (c-'0');
-if ((c>='A')||(c<='F')) return (c-'A')+10;
+if ((c>='0')&&(c<='9')) return (c-'0');
+if ((c>='A')&&(c<='F')) return (c-'A')+10;
 
 return 0;} {}
 } 
diff --git a/compile_linux_fftw.sh b/compile_linux_fftw.sh
@@ -6,7 +6,7 @@ fluid -c GUI.fl
 fluid -c FreeEditUI.fl
 
 g++ -ggdb GUI.cxx FreeEditUI.cxx *.cpp Input/*.cpp Output/*.cpp `fltk-config --cflags` \
- `fltk-config --ldflags`  -laudiofile -lfftw3f -lvorbisenc -lvorbisfile -lportaudio -lpthread -lmad -lmxml -o $outfile
+ `fltk-config --ldflags`  -laudiofile -lfftw3f -lz -logg -lvorbis -lvorbisenc -lvorbisfile -lportaudio -lpthread -lmad -lmxml -o $outfile
 
 rm -f GUI.h GUI.cxx FreeEditUI.h FreeEditUI.cxx
 
diff --git a/compile_linux_fftw_jack.sh b/compile_linux_fftw_jack.sh
@@ -7,7 +7,7 @@ fluid -c FreeEditUI.fl
 
 g++ -ggdb GUI.cxx FreeEditUI.cxx *.cpp Input/*.cpp Output/*.cpp `fltk-config --cflags` \
  `fltk-config --ldflags` \
- -laudiofile -lfftw3f -lvorbisenc -lvorbisfile -lportaudio -lpthread -lmad -lmxml \
+ -laudiofile -lfftw3f -lz -logg -lvorbis  -lvorbisenc -lvorbisfile -lportaudio -lpthread -lmad -lmxml \
  `pkg-config --cflags --libs jack samplerate` \
  -DHAVE_JACK -DENABLE_RESAMPLING \
  -o $outfile
diff --git a/compile_linux_kissfft.sh b/compile_linux_kissfft.sh
@@ -6,6 +6,6 @@ fluid -c FreeEditUI.fl
 
 
 g++ -ggdb -DKISSFFT -I./contrib GUI.cxx FreeEditUI.cxx *.cpp Input/*.cpp Output/*.cpp contrib/*.c `fltk-config --cflags` \
- `fltk-config --ldflags`  -laudiofile  -lvorbisenc -lvorbisfile -lportaudio -lpthread -lmad -lmxml -o $outfile
+ `fltk-config --ldflags` -lz -logg -lvorbis   -laudiofile  -lvorbisenc -lvorbisfile -lportaudio -lpthread -lmad -lmxml -o $outfile
 
 rm -f GUI.h GUI.cxx FreeEditUI.h FreeEditUI.cxx