Browse Source

Merge branch 'v0.5' of https://github.com/VCVRack/Rack into v0.5

pull/574/merge
Andrew Belt 6 years ago
parent
commit
ef3de2a86e
2 changed files with 4 additions and 1 deletions
  1. +3
    -1
      Makefile
  2. +1
    -0
      dep/Makefile

+ 3
- 1
Makefile View File

@@ -14,7 +14,7 @@ ifeq ($(ARCH), lin)
LDFLAGS += -rdynamic \ LDFLAGS += -rdynamic \
-lpthread -lGL -ldl \ -lpthread -lGL -ldl \
$(shell pkg-config --libs gtk+-2.0) \ $(shell pkg-config --libs gtk+-2.0) \
-Ldep/lib -lGLEW -lglfw -ljansson -lsamplerate -lcurl -lzip -lrtaudio -lrtmidi -lcrypto
-Ldep/lib -lGLEW -lglfw -ljansson -lsamplerate -lcurl -lzip -lrtaudio -lrtmidi -lcrypto -lssl
TARGET = Rack TARGET = Rack
endif endif


@@ -169,6 +169,8 @@ ifeq ($(ARCH), lin)
cp dep/lib/libzip.so.5 dist/Rack/ cp dep/lib/libzip.so.5 dist/Rack/
cp dep/lib/librtaudio.so dist/Rack/ cp dep/lib/librtaudio.so dist/Rack/
cp dep/lib/librtmidi.so.4 dist/Rack/ cp dep/lib/librtmidi.so.4 dist/Rack/
cp dep/lib/libssl.so.1.1 dist/Rack/
cp dep/lib/libcrypto.so.1.1 dist/Rack/
mkdir -p dist/Rack/plugins mkdir -p dist/Rack/plugins
cp -R plugins/Fundamental/dist/Fundamental dist/Rack/plugins/ cp -R plugins/Fundamental/dist/Fundamental dist/Rack/plugins/
# Make ZIP # Make ZIP


+ 1
- 0
dep/Makefile View File

@@ -31,6 +31,7 @@ ifeq ($(ARCH),lin)
libzip = lib/libzip.so libzip = lib/libzip.so
rtmidi = lib/librtmidi.so rtmidi = lib/librtmidi.so
rtaudio = lib/librtaudio.so rtaudio = lib/librtaudio.so
openssl = lib/libssl.so
endif endif


ifeq ($(ARCH),mac) ifeq ($(ARCH),mac)


Loading…
Cancel
Save