more Makefile updates

dep/Makefile

@@ -15,12 +15,20 @@ endif
 WGET = wget -nc
 UNTAR = tar xf
 UNZIP = unzip
+
+ifndef CMAKE
 ifeq ($(ARCH),win)
 	CMAKE = cmake -G 'MSYS Makefiles'
 else
 	CMAKE = cmake
 endif
 
+endif
+
+ifndef CONFIGURE
+	CONFIGURE=./configure
+endif
+
 # Libraries
 ifeq ($(ARCH),lin)
 	glew = lib/libGLEW.so
@@ -64,7 +72,7 @@ ifeq ($(ARCH),win)
 	RTAUDIO_FLAGS = -DAUDIO_WINDOWS_DS=ON -DAUDIO_WINDOWS_WASAPI=ON -DAUDIO_WINDOWS_ASIO=ON
 endif
 ifeq ($(ARCH),lin)
-	RTAUDIO_FLAGS = -DAUDIO_LINUX_ALSA=ON
+	RTAUDIO_FLAGS = -DAUDIO_LINUX_ALSA=ON -DAUDIO_UNIX_JACK=ON -DAUDIO_LINUX_PULSE=ON
 endif
 endif
 
@@ -80,10 +88,10 @@ all: $(glew) $(glfw) $(jansson) $(libsamplerate) $(libcurl) $(libzip) $(rtmidi)
 
 $(glew):
 	$(WGET) https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0.tgz
-	$(UNTAR) glew-2.1.0.tgz
-	$(MAKE) -C glew-2.1.0 glew.lib
+#	$(UNTAR) glew-2.1.0.tgz
+#	$(MAKE) -C glew-2.1.0 glew.lib SYSTEM=linux-mingw64
 	# On Linux, default lib path is lib64, so change it back to lib.
-	$(MAKE) -C glew-2.1.0 GLEW_DEST="$(LOCAL)" LIBDIR="$(LOCAL)/lib" install
+#	$(MAKE) -C glew-2.1.0 GLEW_DEST="$(LOCAL)" LIBDIR="$(LOCAL)/lib" install
 
 $(glfw):
 	$(WGET) https://github.com/glfw/glfw/releases/download/3.2.1/glfw-3.2.1.zip
@@ -101,21 +109,21 @@ endif
 $(jansson):
 	$(WGET) http://www.digip.org/jansson/releases/jansson-2.10.tar.gz
 	$(UNTAR) jansson-2.10.tar.gz
-	cd jansson-2.10 && ./configure --prefix="$(LOCAL)"
+	cd jansson-2.10 && $(CONFIGURE) --prefix="$(LOCAL)"
 	$(MAKE) -C jansson-2.10
 	$(MAKE) -C jansson-2.10 install
 
 $(libsamplerate):
 	$(WGET) http://www.mega-nerd.com/SRC/libsamplerate-0.1.9.tar.gz
 	$(UNTAR) libsamplerate-0.1.9.tar.gz
-	cd libsamplerate-0.1.9 && ./configure --prefix="$(LOCAL)" --disable-fftw --disable-sndfile
+	cd libsamplerate-0.1.9 && $(CONFIGURE) --prefix="$(LOCAL)" --disable-fftw --disable-sndfile
 	$(MAKE) -C libsamplerate-0.1.9/src
 	$(MAKE) -C libsamplerate-0.1.9/src install
 
 $(libcurl):
 	$(WGET) https://github.com/curl/curl/releases/download/curl-7_56_0/curl-7.56.0.tar.gz
 	$(UNTAR) curl-7.56.0.tar.gz
-	cd curl-7.56.0 && ./configure --prefix="$(LOCAL)" \
+	cd curl-7.56.0 && $(CONFIGURE) --prefix="$(LOCAL)" \
 		--disable-ftp --disable-file --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual \
 		--without-zlib --without-ca-bundle --without-ca-fallback --without-libpsl --without-libmetalink --without-libssh2 --without-librtmp --without-winidn --without-libidn2 --without-nghttp2
 	$(MAKE) -C curl-7.56.0
@@ -124,19 +132,19 @@ $(libcurl):
 $(libzip):
 	$(WGET) https://nih.at/libzip/libzip-1.2.0.tar.gz
 	$(UNTAR) libzip-1.2.0.tar.gz
-	cd libzip-1.2.0 && ./configure --prefix="$(LOCAL)"
+	cd libzip-1.2.0 && $(CONFIGURE) --prefix="$(LOCAL)"
 	$(MAKE) -C libzip-1.2.0
 	$(MAKE) -C libzip-1.2.0 install
 
 $(rtmidi):
 	$(WGET) http://www.music.mcgill.ca/~gary/rtmidi/release/rtmidi-3.0.0.tar.gz
 	$(UNTAR) rtmidi-3.0.0.tar.gz
-	cd rtmidi-3.0.0 && ./configure --prefix="$(LOCAL)"
+	cd rtmidi-3.0.0 && $(CONFIGURE) --prefix="$(LOCAL)"
 	$(MAKE) -C rtmidi-3.0.0
 	$(MAKE) -C rtmidi-3.0.0 install
 
 $(rtaudio):
-	git clone https://github.com/thestk/rtaudio.git
+	#git clone https://github.com/thestk/rtaudio.git
 	cd rtaudio && mkdir -p cmakebuild
 	cd rtaudio/cmakebuild && cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX="$(LOCAL)" $(RTAUDIO_FLAGS) ..
 	$(MAKE) -C rtaudio/cmakebuild