Browse Source

fix ossia dependency

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

+ 3
- 2
dep/Makefile View File

@@ -58,6 +58,7 @@ ifeq ($(ARCH),win)
rtmidi = bin/librtmidi-4.dll rtmidi = bin/librtmidi-4.dll
rtaudio = bin/librtaudio.dll rtaudio = bin/librtaudio.dll
openssl = bin/libssl-1_1-x64.dll openssl = bin/libssl-1_1-x64.dll
ossia = bin/ossia.dll
endif endif


# Library configuration # Library configuration
@@ -76,7 +77,7 @@ endif


.NOTPARALLEL: .NOTPARALLEL:


all: $(glew) $(glfw) $(jansson) $(libspeexdsp) $(libcurl) $(libzip) $(rtmidi) $(rtaudio)
all: $(glew) $(glfw) $(jansson) $(libspeexdsp) $(libcurl) $(libzip) $(rtmidi) $(rtaudio) $(ossia)
@echo "" @echo ""
@echo "#######################################" @echo "#######################################"
@echo "# Built all dependencies successfully #" @echo "# Built all dependencies successfully #"
@@ -146,8 +147,8 @@ $(rtaudio):
cd rtaudio/cmakebuild && cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX="$(LOCAL)" $(RTAUDIO_FLAGS) .. cd rtaudio/cmakebuild && cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX="$(LOCAL)" $(RTAUDIO_FLAGS) ..
$(MAKE) -C rtaudio/cmakebuild $(MAKE) -C rtaudio/cmakebuild
$(MAKE) -C rtaudio/cmakebuild install $(MAKE) -C rtaudio/cmakebuild install

$(ossia): $(ossia):
# TODO use release tarball instead of building it locally
git clone https://github.com/OSSIA/libossia --depth=1 git clone https://github.com/OSSIA/libossia --depth=1
mkdir -p build-libossia && cd build-libossia && $(CMAKE) \ mkdir -p build-libossia && cd build-libossia && $(CMAKE) \
-DCMAKE_INSTALL_PREFIX="$(LOCAL)" -DOSSIA_PD=OFF \ -DCMAKE_INSTALL_PREFIX="$(LOCAL)" -DOSSIA_PD=OFF \


Loading…
Cancel
Save