diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /media-sound/sndpeek/files | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'media-sound/sndpeek/files')
-rw-r--r-- | media-sound/sndpeek/files/sndpeek-1.3-makefile.patch | 296 | ||||
-rw-r--r-- | media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch | 65 | ||||
-rw-r--r-- | media-sound/sndpeek/files/sndpeek-1.41-makefile.patch | 306 |
3 files changed, 306 insertions, 361 deletions
diff --git a/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch b/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch deleted file mode 100644 index 9b17c99e146b..000000000000 --- a/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch +++ /dev/null @@ -1,296 +0,0 @@ -diff -ru sndpeek-1.3~/src/sndpeek/makefile.alsa sndpeek-1.3/src/sndpeek/makefile.alsa ---- sndpeek-1.3~/src/sndpeek/makefile.alsa 2007-08-12 19:22:00.000000000 +0200 -+++ sndpeek-1.3/src/sndpeek/makefile.alsa 2007-08-12 19:27:57.000000000 +0200 -@@ -1,10 +1,10 @@ - --CC=gcc --CPP=g++ -+CC?=gcc -+CXX?=g++ - INCLUDES=-I../marsyas/ - MARSYAS_DIR=../marsyas/ --CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c --LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile -+CFLAGS+=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c -+LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile - - OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ - Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \ -@@ -12,55 +12,55 @@ - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CPP) -o $@ $(OBJS) $(LIBS) -+ $(CXX) -o $@ $(OBJS) $(LIBS) - - Centroid.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - DownSampler.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Flux.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - LPC.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MFCC.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - RMS.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Rolloff.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - System.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - fvec.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - AutoCorrelation.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Communicator.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Hamming.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MagFFT.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - NormRMS.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MarSignal.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - fmatrix.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - .o: $*.h - -@@ -68,7 +68,7 @@ - $(CC) $(CFLAGS) $*.c - - .cpp.o: $*.h $*.cpp -- $(CC) $(CFLAGS) $*.cpp -+ $(CXX) $(CFLAGS) $*.cpp - - clean: - rm -f sndpeek *~ *.o -diff -ru sndpeek-1.3~/src/sndpeek/makefile.jack sndpeek-1.3/src/sndpeek/makefile.jack ---- sndpeek-1.3~/src/sndpeek/makefile.jack 2007-08-12 19:22:00.000000000 +0200 -+++ sndpeek-1.3/src/sndpeek/makefile.jack 2007-08-12 19:31:29.000000000 +0200 -@@ -1,9 +1,9 @@ --CC=gcc --CPP=g++ -+CC?=gcc -+CXX?=g++ - INCLUDES=-I../marsyas/ - MARSYAS_DIR=../marsyas/ --CFLAGS=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c --LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -ljack -lXmu -lX11 -lXext -lXi -lm -lsndfile -+CFLAGS+=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c -+LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -ljack -lXmu -lX11 -lXext -lXi -lm -lsndfile - - OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ - Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \ -@@ -11,55 +11,55 @@ - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CPP) -o $@ $(OBJS) $(LIBS) -+ $(CXX) -o $@ $(OBJS) $(LIBS) - - Centroid.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - DownSampler.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Flux.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - LPC.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MFCC.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - RMS.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Rolloff.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - System.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - fvec.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - AutoCorrelation.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Communicator.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Hamming.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MagFFT.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - NormRMS.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MarSignal.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - fmatrix.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - .o: $*.h - -@@ -67,7 +67,7 @@ - $(CC) $(CFLAGS) $*.c - - .cpp.o: $*.h $*.cpp -- $(CC) $(CFLAGS) $*.cpp -+ $(CXX) $(CFLAGS) $*.cpp - - clean: - rm -f sndpeek *~ *.o -diff -ru sndpeek-1.3~/src/sndpeek/makefile.oss sndpeek-1.3/src/sndpeek/makefile.oss ---- sndpeek-1.3~/src/sndpeek/makefile.oss 2007-08-12 19:22:00.000000000 +0200 -+++ sndpeek-1.3/src/sndpeek/makefile.oss 2007-08-12 19:33:28.000000000 +0200 -@@ -1,8 +1,8 @@ --CC=gcc --CPP=g++ -+CC?=gcc -+CXX?=g++ - INCLUDES=-I../marsyas/ - MARSYAS_DIR=../marsyas/ --CFLAGS=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c -+CFLAGS+=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c - LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lXmu -lX11 -lXext -lXi -lm -lsndfile - - TARGE=sndpeek -@@ -12,55 +12,55 @@ - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CPP) -o $@ $(OBJS) $(LIBS) -+ $(CXX) -o $@ $(OBJS) $(LIBS) - - Centroid.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - DownSampler.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Flux.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - LPC.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MFCC.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - RMS.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Rolloff.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - System.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - fvec.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - AutoCorrelation.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Communicator.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - Hamming.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MagFFT.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - NormRMS.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - MarSignal.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - fmatrix.o: -- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp - - .o: $*.h - -@@ -68,7 +68,7 @@ - $(CC) $(CFLAGS) $*.c - - .cpp.o: $*.h $*.cpp -- $(CC) $(CFLAGS) $*.cpp -+ $(CXX) $(CFLAGS) $*.cpp - - clean: - rm -f sndpeek *~ *.o diff --git a/media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch b/media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch deleted file mode 100644 index 9822434b263a..000000000000 --- a/media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: sndpeek-1.4/src/sndpeek/makefile.alsa -=================================================================== ---- sndpeek-1.4.orig/src/sndpeek/makefile.alsa -+++ sndpeek-1.4/src/sndpeek/makefile.alsa -@@ -12,7 +12,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CXX) -o $@ $(OBJS) $(LIBS) -+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - Centroid.o: - $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -Index: sndpeek-1.4/src/sndpeek/makefile.jack -=================================================================== ---- sndpeek-1.4.orig/src/sndpeek/makefile.jack -+++ sndpeek-1.4/src/sndpeek/makefile.jack -@@ -11,7 +11,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CXX) -o $@ $(OBJS) $(LIBS) -+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - Centroid.o: - $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -Index: sndpeek-1.4/src/sndpeek/makefile.oss -=================================================================== ---- sndpeek-1.4.orig/src/sndpeek/makefile.oss -+++ sndpeek-1.4/src/sndpeek/makefile.oss -@@ -12,7 +12,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CXX) -o $@ $(OBJS) $(LIBS) -+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - Centroid.o: - $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -Index: sndpeek-1.4/src/sndpeek/makefile.osx -=================================================================== ---- sndpeek-1.4.orig/src/sndpeek/makefile.osx -+++ sndpeek-1.4/src/sndpeek/makefile.osx -@@ -13,7 +13,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CPP) -o $@ $(OBJS) $(LIBS) -+ $(CPP) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - Centroid.o: - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp -Index: sndpeek-1.4/src/sndpeek/makefile.win32 -=================================================================== ---- sndpeek-1.4.orig/src/sndpeek/makefile.win32 -+++ sndpeek-1.4/src/sndpeek/makefile.win32 -@@ -12,7 +12,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp - MagFFT.o NormRMS.o MarSignal.o fmatrix.o - - sndpeek: $(OBJS) -- $(CPP) -o $@ $(OBJS) $(LIBS) -+ $(CPP) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - Centroid.o: - $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp diff --git a/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch b/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch new file mode 100644 index 000000000000..9dc4fa06d10a --- /dev/null +++ b/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch @@ -0,0 +1,306 @@ +diff --git a/src/sndpeek/makefile.alsa b/src/sndpeek/makefile.alsa +index a0f76ba..e50cf82 100644 +--- a/src/sndpeek/makefile.alsa ++++ b/src/sndpeek/makefile.alsa +@@ -1,10 +1,10 @@ + +-CC=gcc +-CPP=g++ ++CC?=gcc ++CXX?=g++ + INCLUDES=-I../marsyas/ + MARSYAS_DIR=../marsyas/ +-CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -O3 -c +-LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile ++CFLAGS_MAIN=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -c ++LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile + + OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ + Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \ +@@ -12,55 +12,58 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ + MagFFT.o NormRMS.o MarSignal.o fmatrix.o + + sndpeek: $(OBJS) +- $(CPP) -o $@ $(OBJS) $(LIBS) ++ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) ++ ++chuck_fft.o: ++ $(CC) $(CFLAGS_MAIN) $(CFLAGS) $*.c + + Centroid.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + DownSampler.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Flux.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + LPC.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MFCC.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + RMS.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Rolloff.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + System.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + fvec.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + AutoCorrelation.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Communicator.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Hamming.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MagFFT.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + NormRMS.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MarSignal.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + fmatrix.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + .o: $*.h + +@@ -68,7 +71,7 @@ fmatrix.o: + $(CC) $(CFLAGS) $*.c + + .cpp.o: $*.h $*.cpp +- $(CC) $(CFLAGS) $*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $*.cpp + + clean: + rm -f sndpeek *~ *.o +diff --git a/src/sndpeek/makefile.jack b/src/sndpeek/makefile.jack +index ec15276..70fa6e3 100644 +--- a/src/sndpeek/makefile.jack ++++ b/src/sndpeek/makefile.jack +@@ -1,8 +1,8 @@ +-CC=gcc +-CPP=g++ ++CC?=gcc ++CXX?=g++ + INCLUDES=-I../marsyas/ + MARSYAS_DIR=../marsyas/ +-CFLAGS=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -O3 -c ++CFLAGS_MAIN=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -c + LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -ljack -lXmu -lX11 -lXext -lXi -lm -lsndfile + + OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ +@@ -11,55 +11,58 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ + MagFFT.o NormRMS.o MarSignal.o fmatrix.o + + sndpeek: $(OBJS) +- $(CPP) -o $@ $(OBJS) $(LIBS) ++ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) ++ ++chuck_fft.o: ++ $(CC) $(CFLAGS_MAIN) $(CFLAGS) $*.c + + Centroid.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + DownSampler.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Flux.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + LPC.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MFCC.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + RMS.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Rolloff.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + System.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + fvec.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + AutoCorrelation.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Communicator.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Hamming.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MagFFT.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + NormRMS.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MarSignal.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + fmatrix.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + .o: $*.h + +@@ -67,7 +70,7 @@ fmatrix.o: + $(CC) $(CFLAGS) $*.c + + .cpp.o: $*.h $*.cpp +- $(CC) $(CFLAGS) $*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $*.cpp + + clean: + rm -f sndpeek *~ *.o +diff --git a/src/sndpeek/makefile.oss b/src/sndpeek/makefile.oss +index f092df2..3ef005c 100644 +--- a/src/sndpeek/makefile.oss ++++ b/src/sndpeek/makefile.oss +@@ -1,8 +1,8 @@ +-CC=gcc +-CPP=g++ ++CC?=gcc ++CXX?=g++ + INCLUDES=-I../marsyas/ + MARSYAS_DIR=../marsyas/ +-CFLAGS=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -O3 -c ++CFLAGS_MAIN=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -c + LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lXmu -lX11 -lXext -lXi -lm -lsndfile + + TARGE=sndpeek +@@ -12,55 +12,58 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ + MagFFT.o NormRMS.o MarSignal.o fmatrix.o + + sndpeek: $(OBJS) +- $(CPP) -o $@ $(OBJS) $(LIBS) ++ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) ++ ++chuck_fft.o: ++ $(CC) $(CFLAGS_MAIN) $(CFLAGS) $*.c + + Centroid.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + DownSampler.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Flux.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + LPC.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MFCC.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + RMS.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Rolloff.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + System.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + fvec.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + AutoCorrelation.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Communicator.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + Hamming.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MagFFT.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + NormRMS.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + MarSignal.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + fmatrix.o: +- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp + + .o: $*.h + +@@ -68,7 +71,7 @@ fmatrix.o: + $(CC) $(CFLAGS) $*.c + + .cpp.o: $*.h $*.cpp +- $(CC) $(CFLAGS) $*.cpp ++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $*.cpp + + clean: + rm -f sndpeek *~ *.o |