diff -rupN faust-0.9.43.old/architecture/osclib/faust/Makefile faust-0.9.43/architecture/osclib/faust/Makefile
--- faust-0.9.43.old/architecture/osclib/faust/Makefile 2011-07-21 12:02:24.000000000 -0400
+++ faust-0.9.43/architecture/osclib/faust/Makefile 2011-11-25 13:54:51.189933652 -0500
@@ -1,3 +1,4 @@
+libname := libOSCFaust.so
subprojects := include src src/lib src/msg src/nodes src/osc src/threads
sources = $(wildcard src/*.cpp) $(wildcard src/*/*.cpp)
objects = $(sources:.cpp=.o)
diff -rupN faust-0.9.43.old/architecture/osclib/Makefile faust-0.9.43/architecture/osclib/Makefile
--- faust-0.9.43.old/architecture/osclib/Makefile 2011-07-21 12:02:24.000000000 -0400
+++ faust-0.9.43/architecture/osclib/Makefile 2011-11-25 13:50:06.744343321 -0500
@@ -14,10 +14,10 @@ all : liboscpack.a libOSCFaust.a
liboscpack.a : oscpack/liboscpack.a
- cp oscpack/liboscpack.a $@
+ cp -P oscpack/liboscpack.* .
libOSCFaust.a : faust/libOSCFaust.a
- cp faust/libOSCFaust.a $@
+ cp -P faust/libOSCFaust.* .
oscpack/liboscpack.a:
diff -rupN faust-0.9.43.old/architecture/osclib/oscpack/Makefile faust-0.9.43/architecture/osclib/oscpack/Makefile
--- faust-0.9.43.old/architecture/osclib/oscpack/Makefile 2011-07-21 12:02:24.000000000 -0400
+++ faust-0.9.43/architecture/osclib/oscpack/Makefile 2011-11-25 13:22:13.207534095 -0500
@@ -1,4 +1,4 @@
-libname := liboscpack.a
+libname := liboscpack.so
system ?= $(shell uname -s)
ifeq ($(system), Darwin)
@@ -30,8 +30,9 @@ all: $(libname)
$(libname): $(objects)
rm -f $@
- ar cq $@ $(objects)
- ranlib $@
+ $(CXX) $(CXXFLAGS) -shared $(objects) -fPIC -Wl,-soname -Wl,$(libname).0 -o $(libname).0.0.0
+ ln -sf $(libname).0.0.0 $(libname).0
+ ln -sf $(libname).0.0.0 $(libname)
depend :
makedepend -fMakefile -w120 -Y -- $(CXXFLAGS) -- $(sources)
diff -rupN faust-0.9.43.old/Makefile faust-0.9.43/Makefile
--- faust-0.9.43.old/Makefile 2011-07-21 12:02:24.000000000 -0400
+++ faust-0.9.43/Makefile 2011-11-25 14:05:40.979690040 -0500
@@ -2,11 +2,15 @@ version := 0.9.43
DESTDIR ?=
PREFIX ?= /usr/local
+LIBDIR ?= /usr/local/lib
+INCLUDEDIR ?= /usr/local/include
CROSS=i586-mingw32msvc-
MAKEFILE := Makefile.unix
prefix := $(DESTDIR)$(PREFIX)
+libdir := $(DESTDIR)$(LIBDIR)
+includedir := $(DESTDIR)$(INCLUDEDIR)
arch := $(wildcard architecture/*.*)
mfiles := $(wildcard examples/Makefile.*)
vname := faust-$(version)-$(shell date +%y%m%d.%H%M%S)
@@ -52,8 +56,10 @@ doc :
install :
- mkdir -p $(prefix)/lib/faust/osclib
+ mkdir -p $(libdir)
+ mkdir -p $(prefix)/share/faust
mkdir -p $(prefix)/bin/
+ mkdir -p $(includedir)
install compiler/faust $(prefix)/bin/
install -m 0644 $(arch) $(prefix)/lib/faust/
rm -rf $(prefix)/lib/faust/VST
@@ -62,8 +68,8 @@ install :
cp -r architecture/iPhone $(prefix)/lib/faust/
cp -r architecture/audio $(prefix)/lib/faust/
cp -r architecture/gui $(prefix)/lib/faust/
- cp architecture/osclib/lib*.a $(prefix)/lib/faust/osclib
- cp architecture/osclib/faust/include/*.h $(prefix)/lib/faust/osclib
+ cp -Pr architecture/osclib/lib*.so* $(libdir)
+ cp -pr architecture/osclib/faust/include/*.h $(includedir)
find $(prefix)/lib/faust/ -name CVS | xargs rm -rf
install -m 0644 $(mfiles) $(prefix)/lib/faust/
make -C tools/faust2appls install
diff -rupN faust-0.9.43.old/tools/faust2appls/faust2alqt faust-0.9.43/tools/faust2appls/faust2alqt
--- faust-0.9.43.old/tools/faust2appls/faust2alqt 2011-07-21 12:02:24.000000000 -0400
+++ faust-0.9.43/tools/faust2appls/faust2alqt 2011-11-25 15:14:05.699689927 -0500
@@ -41,9 +41,9 @@ for p in $@; do
if [ "$p" = -icc ]; then
ignore=" "
elif [ $p = "-osc" ]; then
- OSCINC="INCLUDEPATH+=/usr/local/lib/faust/osclib"
+ OSCINC="INCLUDEPATH+=/usr/include"
QTDEFS="DEFINES += OSCCTRL"
- OSCLIB="-L/usr/local/lib/faust/osclib -lOSCFaust -loscpack"
+ OSCLIB="-lOSCFaust -loscpack"
elif [ ${p:0:1} = "-" ]; then
OPTIONS="$OPTIONS $p"
elif [[ -e "$p" ]]; then
@@ -83,7 +83,7 @@ for p in $FILES; do
# compile c++ to binary
(
cd "$TMP"
- qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/local/lib/faust/" "$OSCINC" "LIBS+=-lasound $OSCLIB" "HEADERS+=/usr/local/lib/faust/gui/faustqt.h" "$QTDEFS"
+ qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/share/faust/" "$OSCINC" "LIBS+=-lasound $OSCLIB" "HEADERS+=/usr/share/faust/gui/faustqt.h" "$QTDEFS"
qmake $SPEC
make
) > /dev/null
diff -rupN faust-0.9.43.old/tools/faust2appls/faust2alsa faust-0.9.43/tools/faust2appls/faust2alsa
--- faust-0.9.43.old/tools/faust2appls/faust2alsa 2011-07-21 12:02:24.000000000 -0400
+++ faust-0.9.43/tools/faust2appls/faust2alsa 2011-11-25 15:10:10.990082303 -0500
@@ -47,7 +47,7 @@ for p in $@; do
if [ "$p" = -icc ]; then
ignore=" "
elif [ $p = "-osc" ]; then
- OSCDEFS="-I/usr/local/lib/faust/osclib -DOSCCTRL -L/usr/local/lib/faust/osclib -lOSCFaust -loscpack"
+ OSCDEFS="-I/usr/include -DOSCCTRL -lOSCFaust -loscpack"
elif [ ${p:0:1} = "-" ]; then
OPTIONS="$OPTIONS $p"
elif [[ -e "$p" ]]; then
diff -rupN faust-0.9.43.old/tools/faust2appls/faust2caqt faust-0.9.43/tools/faust2appls/faust2caqt
--- faust-0.9.43.old/tools/faust2appls/faust2caqt 2011-07-21 12:02:24.000000000 -0400
+++ faust-0.9.43/tools/faust2appls/faust2caqt 2011-11-25 15:13:46.636802753 -0500
@@ -41,9 +41,9 @@ for p in $@; do
elif [ "$p" = -icc ]; then
ignore=" "
elif [ "$p" = "-osc" ]; then
- OSCINC="INCLUDEPATH+=/usr/local/lib/faust/osclib"
+ OSCINC="INCLUDEPATH+=/usr/include"
QTDEFS="DEFINES += OSCCTRL"
- OSCLIB="-L/usr/local/lib/faust/osclib -lOSCFaust -loscpack"
+ OSCLIB="-lOSCFaust -loscpack"
elif [ ${p:0:1} = "-" ]; then
OPTIONS="$OPTIONS $p"
elif [[ -e "$p" ]]; then
@@ -83,7 +83,7 @@ for p in $FILES; do
# compile c++ to binary
(
cd "$TMP"
- qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/local/lib/faust/" "$OSCINC" "LIBS+=-framework CoreAudio -framework AudioUnit -framework CoreServices $OSCLIB" "HEADERS+=/usr/local/lib/faust/gui/faustqt.h" "$QTDEFS"
+ qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/share/faust/" "$OSCINC" "LIBS+=-framework CoreAudio -framework AudioUnit -framework CoreServices $OSCLIB" "HEADERS+=/usr/share/faust/gui/faustqt.h" "$QTDEFS"
qmake $SPEC
make
) > /dev/null #2>/dev/null
diff -rupN faust-0.9.43.old/tools/faust2appls/faust2dssi faust-0.9.43/tools/faust2appls/faust2dssi
--- faust-0.9.43.old/tools/faust2appls/faust2dssi 2011-07-21 12:02:24.000000000 -0400
+++ faust-0.9.43/tools/faust2appls/faust2dssi 2011-11-25 15:11:38.220563997 -0500
@@ -39,7 +39,7 @@ for p in $@; do
ignore=" "
elif [ $p = "-osc" ]; then
#option ignored for dssi plugins
- OSCDEFS="-I/usr/local/lib/faust/osclib -DOSCCTRL -L/usr/local/lib/faust/osclib -lOSCFaust -loscpack"
+ OSCDEFS="-I/usr/include -DOSCCTRL -lOSCFaust -loscpack"
elif [ ${p:0:1} = "-" ]; then
OPTIONS="$OPTIONS $p"
elif [[ -e "$p" ]]; then
diff -rupN faust-0.9.43.old/tools/faust2appls/faust2jack faust-0.9.43/tools/faust2appls/faust2jack
--- faust-0.9.43.old/tools/faust2appls/faust2jack 2011-07-21 12:02:24.000000000 -0400
+++ faust-0.9.43/tools/faust2appls/faust2jack 2011-11-25 15:08:15.133772250 -0500
@@ -48,7 +48,7 @@ for p in $@; do
if [ "$p" = -icc ]; then
ignore=" "
elif [ $p = "-osc" ]; then
- OSCDEFS="-I/usr/local/lib/faust/osclib -DOSCCTRL -L/usr/local/lib/faust/osclib -lOSCFaust -loscpack"
+ OSCDEFS="-I/usr/include -DOSCCTRL -lOSCFaust -loscpack"
elif [ ${p:0:1} = "-" ]; then
OPTIONS="$OPTIONS $p"
elif [[ -e "$p" ]]; then
@@ -71,7 +71,7 @@ for f in $FILES; do
# compile c++ to binary
(
- $CXX $CXXFLAGS $OMP -I/usr/local/lib/faust "$f.cpp" `pkg-config --cflags --libs jack gtk+-2.0` $OSCDEFS -o "${f%.dsp}"
+ $CXX $CXXFLAGS $OMP -I/usr/include "$f.cpp" `pkg-config --cflags --libs jack gtk+-2.0` $OSCDEFS -o "${f%.dsp}"
) > /dev/null
rm "$f.cpp"
diff -rupN faust-0.9.43.old/tools/faust2appls/faust2jackserver faust-0.9.43/tools/faust2appls/faust2jackserver
--- faust-0.9.43.old/tools/faust2appls/faust2jackserver 2011-07-21 12:02:24.000000000 -0400
+++ faust-0.9.43/tools/faust2appls/faust2jackserver 2011-11-25 15:12:49.317142282 -0500
@@ -12,7 +12,7 @@ if [[ $(uname) == Darwin ]]; then
faust -a jack-qt.cpp $f -o $TMP/${f%.dsp}.cpp
- cd $TMP; qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/local/lib/faust/" "LIBS+=-ljackserver" "HEADERS+=/usr/local/lib/faust/gui/faustqt.h"
+ cd $TMP; qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/share/faust/" "LIBS+=-ljackserver" "HEADERS+=/usr/share/faust/gui/faustqt.h"
cd $TMP; qmake
echo toto
cd $TMP; xcodebuild -project ${f%.dsp}.xcodeproj
diff -rupN faust-0.9.43.old/tools/faust2appls/faust2jaqt faust-0.9.43/tools/faust2appls/faust2jaqt
--- faust-0.9.43.old/tools/faust2appls/faust2jaqt 2011-07-21 12:02:24.000000000 -0400
+++ faust-0.9.43/tools/faust2appls/faust2jaqt 2011-11-25 15:13:26.155924023 -0500
@@ -41,9 +41,9 @@ for p in $@; do
if [ "$p" = -icc ]; then
ignore=" "
elif [ $p = "-osc" ]; then
- OSCINC="INCLUDEPATH+=/usr/local/lib/faust/osclib"
+ OSCINC="INCLUDEPATH+=/usr/include"
QTDEFS="DEFINES += OSCCTRL"
- OSCLIB="-L/usr/local/lib/faust/osclib -lOSCFaust -loscpack"
+ OSCLIB="-lOSCFaust -loscpack"
elif [ ${p:0:1} = "-" ]; then
OPTIONS="$OPTIONS $p"
elif [[ -e "$p" ]]; then
@@ -83,7 +83,7 @@ for p in $FILES; do
# compile c++ to binary
(
cd "$TMP"
- qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/local/lib/faust/" "$OSCINC" "LIBS+=-ljack $OSCLIB" "HEADERS+=/usr/local/lib/faust/gui/faustqt.h" "$QTDEFS"
+ qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/share/faust" "$OSCINC" "LIBS+=-ljack $OSCLIB" "HEADERS+=/usr/share/faust/gui/faustqt.h" "$QTDEFS"
qmake $SPEC
make
) > /dev/null
diff -rupN faust-0.9.43.old/tools/faust2appls/faust2ladspa faust-0.9.43/tools/faust2appls/faust2ladspa
--- faust-0.9.43.old/tools/faust2appls/faust2ladspa 2011-07-21 12:02:24.000000000 -0400
+++ faust-0.9.43/tools/faust2appls/faust2ladspa 2011-11-25 15:04:17.608192503 -0500
@@ -42,7 +42,7 @@ for p in $@; do
ignore=" "
elif [ $p = "-osc" ]; then
#option ignored for plugins
- OSCDEFS="-I/usr/local/lib/faust/osclib -DOSCCTRL -L/usr/local/lib/faust/osclib -lOSCFaust -loscpack"
+ OSCDEFS="-DOSCCTRL -lOSCFaust -loscpack"
elif [ ${p:0:1} = "-" ]; then
OPTIONS="$OPTIONS $p"
elif [[ -e "$p" ]]; then
diff -rupN faust-0.9.43.old/tools/faust2appls/faust2paqt faust-0.9.43/tools/faust2appls/faust2paqt
--- faust-0.9.43.old/tools/faust2appls/faust2paqt 2011-07-21 12:02:24.000000000 -0400
+++ faust-0.9.43/tools/faust2appls/faust2paqt 2011-11-25 15:12:14.981345868 -0500
@@ -41,9 +41,9 @@ for p in $@; do
if [ "$p" = -icc ]; then
ignore=" "
elif [ $p = "-osc" ]; then
- OSCINC="INCLUDEPATH+=/usr/local/lib/faust/osclib"
+ OSCINC="INCLUDEPATH+=/usr/include"
QTDEFS="DEFINES += OSCCTRL"
- OSCLIB="-L/usr/local/lib/faust/osclib -lOSCFaust -loscpack"
+ OSCLIB="-lOSCFaust -loscpack"
elif [ ${p:0:1} = "-" ]; then
OPTIONS="$OPTIONS $p"
elif [[ -e "$p" ]]; then
@@ -83,7 +83,7 @@ for p in $FILES; do
# compile c++ to binary
(
cd "$TMP"
- qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/local/lib/faust/" "$OSCINC" "LIBS+=-lportaudio $OSCLIB" "HEADERS+=/usr/local/lib/faust/gui/faustqt.h" "$QTDEFS"
+ qmake -project "INCLUDEPATH+=$CUR" "INCLUDEPATH+=/usr/share/faust" "$OSCINC" "LIBS+=-lportaudio $OSCLIB" "HEADERS+=/usr/share/faust/gui/faustqt.h" "$QTDEFS"
qmake $SPEC
make
) > /dev/null