Merge branch 'master' of https://github.com/andreasb242/xournalpp.git

windows-setup/.gitignore

@@ -3,5 +3,7 @@ xournalpp-setup.exe
 xournalpp_launcher
 xournalpp.exe
 xpp.res
-
+portaudio
+pa_stable_*.tgz
+sox-code
 

windows-setup/build-sox.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# go to script directory
+cd "${0%/*}"
+
+# Generation does not work...
+# So do this manually...
+./sox-pc.sh > /mingw64/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
+
+echo "TODO Manual changes required:"
+echo "Open CMakeLists.txt and remove -fstack-protector after"
+echo "if(CMAKE_COMPILER_IS_GNUCC)"
+echo "after this run the rest of the script manually!"
+exit;
+#if(CMAKE_COMPILER_IS_GNUCC)
+#	add_definitions(-Wall -W -Wmissing-prototypes -Wstrict-prototypes -pedantic -Wno-format -Wno-long-long)
+#endif(CMAKE_COMPILER_IS_GNUCC)
+
+
+cmake -G "MSYS Makefiles" -DCMAKE_INSTALL_PREFIX=/mingw64 ..
+
+make -j2
+#make install
+

windows-setup/sox-pc.sh

@@ -0,0 +1,15 @@
+echo "prefix="
+echo "exec_prefix="
+echo "libdir="
+
+incdir=`pwd`/sox-code/src
+
+echo "includedir=$incdir"
+echo ""
+echo "Name: SoX"
+echo "Description: Audio file format and effects library"
+echo "Version: "
+echo "URL: http://sox.sourceforge.net"
+echo "Libs: -L${libdir} -lsox"
+echo "Libs.private: "
+echo "Cflags: -I\${includedir}"