Use library files as target names in dep/Makefile instead of build

folder names

dep/Makefile

@@ -16,21 +16,44 @@ WGET = wget -nc
 UNTAR = tar xf
 UNZIP = unzip
 ifeq ($(ARCH),win)
-CMAKE = cmake -G 'MSYS Makefiles'
+	CMAKE = cmake -G 'MSYS Makefiles'
 else
-CMAKE = cmake
+	CMAKE = cmake
 endif
 
-# Packages
-glew = glew-2.1.0
-glfw = glfw-3.2.1
-jansson = jansson-2.10
-libsamplerate = libsamplerate-0.1.9
-libcurl = curl-7.54.1
-libzip = libzip-1.2.0
-portmidi = portmidi
-portaudio = portaudio
-asio = asiosdk2.3
+# Libraries
+ifeq ($(ARCH),lin)
+	glew = lib/libGLEW.so
+	glfw = lib/libglfw.so
+	jansson = lib/libjansson.so
+	libsamplerate = lib/libsamplerate.so
+	libcurl = lib/libcurl.so
+	libzip = lib/libzip.so
+	portmidi = lib/libportmidi.so
+	portaudio = lib/libportaudio.so
+endif
+
+ifeq ($(ARCH),mac)
+	glew = lib/libGLEW.dylib
+	glfw = lib/libglfw.dylib
+	jansson = lib/libjansson.dylib
+	libsamplerate = lib/libsamplerate.dylib
+	libcurl = lib/libcurl.dylib
+	libzip = lib/libzip.dylib
+	portmidi = lib/libportmidi.dylib
+	portaudio = lib/libportaudio.dylib
+endif
+
+ifeq ($(ARCH),win)
+	glew = bin/glew32.dll
+	glfw = bin/glfw3.dll
+	jansson = bin/libjansson-4.dll
+	libsamplerate = bin/libsamplerate-0.dll
+	libcurl = bin/libcurl-4.dll
+	libzip = bin/libzip-5.dll
+	portmidi = bin/libportmidi.dll
+	portaudio = bin/libportaudio_x64.dll
+endif
 
 
 .NOTPARALLEL:
@@ -43,75 +66,75 @@ all: $(glew) $(glfw) $(jansson) $(libsamplerate) $(libcurl) $(libzip) $(portmidi
 	@echo ""
 
 $(glew):
-	$(WGET) https://downloads.sourceforge.net/project/glew/glew/$(patsubst glew-%,%,$@)/$@.tgz
-	$(UNTAR) $@.tgz
-	$(MAKE) -C $@ glew.lib
+	$(WGET) https://downloads.sourceforge.net/project/glew/glew/2.1.0/glew-2.1.0.tgz
+	$(UNTAR) glew-2.1.0.tgz
+	$(MAKE) -C glew-2.1.0 glew.lib
 	# On Linux, default lib path is lib64, so change it back to lib.
-	$(MAKE) -C $@ 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/$(patsubst glfw-%,%,$@)/$@.zip
-	$(UNZIP) $@.zip
-	cd $@ && $(CMAKE) . \
+	$(WGET) https://github.com/glfw/glfw/releases/download/3.2.1/glfw-3.2.1.zip
+	$(UNZIP) glfw-3.2.1.zip
+	cd glfw-3.2.1 && $(CMAKE) . \
 		-DCMAKE_INSTALL_PREFIX="$(LOCAL)" -DBUILD_SHARED_LIBS=ON \
 		-DGLFW_USE_CHDIR=OFF -DGLFW_USE_MENUBAR=ON -DGLFW_USE_RETINA=ON
-	$(MAKE) -C $@
-	$(MAKE) -C $@ install
+	$(MAKE) -C glfw-3.2.1
+	$(MAKE) -C glfw-3.2.1 install
 ifeq ($(ARCH),win)
 	# Not sure why the GLFW build system puts a .dll in the lib directory
 	mv "$(LOCAL)/lib/glfw3.dll" "$(LOCAL)/bin/"
 endif
 
 $(jansson):
-	$(WGET) http://www.digip.org/jansson/releases/$@.tar.gz
-	$(UNTAR) $@.tar.gz
-	cd $@ && ./configure --prefix="$(LOCAL)"
-	$(MAKE) -C $@
-	$(MAKE) -C $@ install
+	$(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)"
+	$(MAKE) -C jansson-2.10
+	$(MAKE) -C jansson-2.10 install
 
 $(libsamplerate):
-	$(WGET) http://www.mega-nerd.com/SRC/$@.tar.gz
-	$(UNTAR) $@.tar.gz
-	cd $@ && ./configure --prefix="$(LOCAL)"
-	$(MAKE) -C $@
-	$(MAKE) -C $@ install
+	$(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)"
+	$(MAKE) -C libsamplerate-0.1.9
+	$(MAKE) -C libsamplerate-0.1.9 install
 
 $(libcurl):
-	$(WGET) https://curl.haxx.se/download/$@.tar.gz
-	$(UNTAR) $@.tar.gz
-	cd $@ && ./configure --prefix="$(LOCAL)" \
+	$(WGET) https://curl.haxx.se/download/curl-7.54.1.tar.gz
+	$(UNTAR) curl-7.54.1.tar.gz
+	cd curl-7.54.1 && ./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-ssl --without-ca-bundle --without-ca-path --without-ca-fallback --without-libpsl --without-libmetalink --without-libssh2 --without-librtmp --without-winidn --without-libidn2 --without-nghttp2
-	$(MAKE) -C $@
-	$(MAKE) -C $@ install
+	$(MAKE) -C curl-7.54.1
+	$(MAKE) -C curl-7.54.1 install
 
 $(libzip):
-	$(WGET) https://nih.at/libzip/$@.tar.gz
-	$(UNTAR) $@.tar.gz
-	cd $@ && ./configure --prefix="$(LOCAL)"
-	$(MAKE) -C $@
-	$(MAKE) -C $@ install
+	$(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)"
+	$(MAKE) -C libzip-1.2.0
+	$(MAKE) -C libzip-1.2.0 install
 
 $(portmidi):
-	git clone https://github.com/AndrewBelt/portmidi.git $@
-	cd $@ && $(CMAKE) . -DCMAKE_INSTALL_PREFIX="$(LOCAL)" -DCMAKE_BUILD_TYPE=Release
-	$(MAKE) -C $@
-	$(MAKE) -C $@ install
+	git clone https://github.com/AndrewBelt/portmidi.git portmidi
+	cd portmidi && $(CMAKE) . -DCMAKE_INSTALL_PREFIX="$(LOCAL)" -DCMAKE_BUILD_TYPE=Release
+	$(MAKE) -C portmidi
+	$(MAKE) -C portmidi install
 
 $(portaudio):
 ifeq ($(ARCH),win)
 	$(WGET) https://github.com/adfernandes/precompiled-portaudio-windows/raw/master/portaudio-r1891-build.zip
 	$(UNZIP) portaudio-r1891-build.zip
-	mv portaudio-r1891-build $@
+	mv portaudio-r1891-build portaudio
 	cp portaudio/lib/x64/ReleaseMinDependency/portaudio_x64.lib "$(LOCAL)/lib"
 	cp portaudio/lib/x64/ReleaseMinDependency/portaudio_x64.dll "$(LOCAL)/bin"
 	cp portaudio/include/*.h "$(LOCAL)/include"
 else
 	$(WGET) http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz
 	$(UNTAR) pa_stable_v190600_20161030.tgz
-	cd $@ && ./configure --prefix="$(LOCAL)" $(PORTAUDIO_ASIO)
-	$(MAKE) -C $@
-	$(MAKE) -C $@ install
+	cd portaudio && ./configure --prefix="$(LOCAL)" $(PORTAUDIO_ASIO)
+	$(MAKE) -C portaudio
+	$(MAKE) -C portaudio install
 endif
 
 clean: