diff --git a/Makefile b/Makefile index 54db1ffd..217a0a51 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ ifeq ($(ARCH), win) LDFLAGS += -static-libgcc -static-libstdc++ -lpthread \ -Wl,--export-all-symbols,--out-implib,libRack.a -mwindows \ -lgdi32 -lopengl32 -lcomdlg32 -lole32 \ - -Ldep/lib -lglew32 -lglfw3dll -lcurl -lzip -lportaudio_x64 -lrtmidi \ + -Ldep/lib -lglew32 -lglfw3dll -lcurl -lzip -lrtaudio -lrtmidi \ -Wl,-Bstatic -ljansson -lsamplerate TARGET = Rack.exe OBJECTS = Rack.res @@ -135,7 +135,7 @@ ifeq ($(ARCH), win) cp dep/bin/librtmidi-4.dll dist/Rack/ cp dep/bin/libsamplerate-0.dll dist/Rack/ cp dep/bin/libzip-5.dll dist/Rack/ - cp dep/bin/portaudio_x64.dll dist/Rack/ + cp dep/bin/librtaudio-6.dll dist/Rack/ mkdir -p dist/Rack/plugins cp -R plugins/Fundamental/dist/Fundamental dist/Rack/plugins/ # Make ZIP diff --git a/dep/Makefile b/dep/Makefile index 5535a050..0e113e75 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -52,6 +52,7 @@ ifeq ($(ARCH),win) libcurl = bin/libcurl-4.dll libzip = bin/libzip-5.dll rtmidi = bin/librtmidi-4.dll + rtaudio = bin/librtaudio-6.dll endif @@ -124,7 +125,9 @@ $(rtmidi): $(rtaudio): $(WGET) http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-5.0.0.tar.gz $(UNTAR) rtaudio-5.0.0.tar.gz - cd rtaudio-5.0.0 && ./configure --prefix="$(LOCAL)" +ifeq ($(ARCH),win) + cd rtaudio-5.0.0 && ./configure --prefix="$(LOCAL)" --with-asio --with-wasapi --with-ds +endif $(MAKE) -C rtaudio-5.0.0 $(MAKE) -C rtaudio-5.0.0 install