diff --git a/Makefile b/Makefile index c4b43369..c5b9d45a 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ ifeq ($(ARCH), mac) CXXFLAGS += -DAPPLE -stdlib=libc++ LDFLAGS += -stdlib=libc++ -lpthread -ldl \ -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo \ - -Ldep/lib -lGLEW -lglfw -ljansson -lsamplerate -lcurl -lzip -lportaudio -lrtmidi + -Ldep/lib -lGLEW -lglfw -ljansson -lsamplerate -lcurl -lzip -lportaudio -lrtmidi -lossia TARGET = Rack BUNDLE = dist/$(TARGET).app endif @@ -34,7 +34,7 @@ ifeq ($(ARCH), win) -Wl,--export-all-symbols,--out-implib,libRack.a -mwindows \ -lgdi32 -lopengl32 -lcomdlg32 -lole32 \ -Ldep/lib -lglew32 -lglfw3dll -lcurl -lzip -lportaudio_x64 -lrtmidi \ - -Wl,-Bstatic -ljansson -lsamplerate + -Wl,-Bstatic -ljansson -lsamplerate -lossia TARGET = Rack.exe OBJECTS = Rack.res endif diff --git a/dep/Makefile b/dep/Makefile index 1271b3e5..e414a00f 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -131,12 +131,13 @@ $(rtaudio): $(MAKE) -C rtaudio-5.0.0 install $(ossia): - # TODO use release tarball instead of building it locally - git clone https://github.com/OSSIA/libossia --recursive - cd libossia && $(CMAKE) . \ - -DCMAKE_INSTALL_PREFIX="$(LOCAL)" -DOSSIA_PD=OFF \ - -DOSSIA_COTIRE=OFF -DOSSIA_PROTOCOL_MIDI=OFF . - $(MAKE) -j4 + # TODO use release tarball instead of building it locally + git clone https://github.com/OSSIA/libossia --depth=1 + mkdir -p build-libossia && cd build-libossia && $(CMAKE) \ + -DCMAKE_INSTALL_PREFIX="$(LOCAL)" -DOSSIA_PD=OFF \ + -DOSSIA_COTIRE=OFF -DOSSIA_PROTOCOL_MIDI=OFF \ + -DOSSIA_EDITOR=OFF -DBUILD_TYPE=Release ../libossia && \ + $(MAKE) -j4 && \ $(MAKE) install clean: