Merge pull request #867 from andreasb242/mac-build

Mac build

mac-setup/.gitignore

@@ -12,3 +12,5 @@ gtk-mac-integration
 portaudio
 pa_stable_*.tgz
 sox-code
+libsndfile
+

mac-setup/README.md

@@ -81,10 +81,10 @@ export PATH="$HOME/.local/bin:$HOME/gtk/inst/bin:$PATH"
 autoreconf -if && ./configure --enable-cxx --prefix=$HOME/gtk/inst
 ````
 
-#### 5. PortAudio
+#### 5. sndfile
 
 ````bash
-./build-sox.sh
+./build-sndfile.sh
 ````
 
 

mac-setup/build-sndfile.sh

@@ -0,0 +1,19 @@
+# go to script directory
+cd "${0%/*}"
+
+export PATH="$HOME/.local/bin:$HOME/gtk/inst/bin:$PATH"
+
+git clone https://github.com/erikd/libsndfile.git
+
+cd libsndfile
+
+mkdir build
+cd build
+
+$HOME/gtk/inst/bin/cmake -DCMAKE_INSTALL_PREFIX:PATH=$HOME/gtk/inst ..
+make -j8
+make install
+
+# Fix linker flags
+cp portaudio-2.0.pc $HOME/gtk/inst/lib/pkgconfig
+

mac-setup/build-sox.sh

@@ -1,20 +0,0 @@
-# go to script directory
-cd "${0%/*}"
-
-export PATH="$HOME/.local/bin:$HOME/gtk/inst/bin:$PATH"
-
-# Generation does not work... (really buggy with CMake, but does not work at all with automake on MingW)
-# So do this manually...
-./sox-pc.sh > $HOME/gtk/inst/lib/pkgconfig/sox.pc
-
-
-git clone https://git.code.sf.net/p/sox/code sox-code
-
-cd sox-code
-git checkout tags/sox-14.4.2 -b sox-14.4.2
-
-mkdir build
-cd build
-
-$HOME/gtk/inst/bin/cmake -DCMAKE_INSTALL_PREFIX:PATH=$HOME/gtk/inst ..
-make -j8

mac-setup/portaudio-2.0.pc

@@ -0,0 +1,12 @@
+prefix=/Users/andreas/gtk/inst
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: PortAudio
+Description: Portable audio I/O
+Requires:
+Version: 19
+
+Libs: -L${libdir} -lportaudio
+Cflags: -I${includedir} 

mac-setup/sox-pc.sh

@@ -1,22 +0,0 @@
-echo "prefix="
-echo "exec_prefix="
-
-libdir1=`pwd`/sox-code/build/src
-echo "libdir1=$libdir1"
-
-libdir2=`pwd`/sox-code/build/libgsm
-echo "libdir2=$libdir2"
-
-libdir3=`pwd`/sox-code/build/lpc10
-echo "libdir3=$libdir3"
-
-incdir=`pwd`/sox-code/src
-echo "includedir=$incdir"
-echo ""
-echo "Name: SoX"
-echo "Description: Audio file format and effects library"
-echo "Version: 14.4.2"
-echo "URL: http://sox.sourceforge.net"
-echo "Libs: -L\${libdir1} -L\${libdir2} -L\${libdir3} -llibsox -llpc10 -lgsm -lgomp"
-echo "Libs.private: "
-echo "Cflags: -I\${includedir}"