Browse Source

fix libossia dep building

pull/574/head
Antoine Villeret 7 years ago
parent
commit
2b315e6af3
2 changed files with 9 additions and 8 deletions
  1. +2
    -2
      Makefile
  2. +7
    -6
      dep/Makefile

+ 2
- 2
Makefile View File

@@ -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


+ 7
- 6
dep/Makefile View File

@@ -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:


Loading…
Cancel
Save