Browse Source

Add zstd and libarchive to dep build.

tags/v2.0.0
Andrew Belt 4 years ago
parent
commit
7d4241d2d0
2 changed files with 35 additions and 4 deletions
  1. +3
    -3
      Makefile
  2. +32
    -1
      dep/Makefile

+ 3
- 3
Makefile View File

@@ -33,7 +33,7 @@ build/dep/osdialog/osdialog_gtk3.c.o: FLAGS += $(shell pkg-config --cflags gtk+-
FLAGS += -fno-gnu-unique

LDFLAGS += -Wl,--whole-archive
LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a
LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libarchive.a dep/lib/libzstd.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a -lstdc++fs
LDFLAGS += -Wl,--no-whole-archive
LDFLAGS += -lpthread -lGL -ldl -lX11 -lasound -ljack
LDFLAGS += $(shell pkg-config --libs gtk+-3.0)
@@ -49,7 +49,7 @@ ifdef ARCH_MAC
LDFLAGS += -lpthread -ldl
LDFLAGS += -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -framework CoreAudio -framework CoreMIDI
LDFLAGS += -Wl,-all_load
LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a
LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libarchive.a dep/lib/libzstd.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a

STANDALONE_TARGET := Rack
STANDALONE_LDFLAGS += -stdlib=libc++
@@ -64,7 +64,7 @@ ifdef ARCH_WIN
LDFLAGS += -Wl,--export-all-symbols
LDFLAGS += -Wl,--out-implib,$(TARGET).a
LDFLAGS += -Wl,-Bstatic -Wl,--whole-archive
LDFLAGS += dep/lib/libglew32.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/librtaudio.a dep/lib/librtmidi.a
LDFLAGS += dep/lib/libglew32.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/libarchive.a dep/lib/libzstd.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/librtaudio.a dep/lib/librtmidi.a
LDFLAGS += -Wl,-Bdynamic -Wl,--no-whole-archive
LDFLAGS += -lpthread -lopengl32 -lgdi32 -lws2_32 -lcomdlg32 -lole32 -ldsound -lwinmm -lksuser -lshlwapi -lmfplat -lmfuuid -lwmcodecdspuuid -ldbghelp



+ 32
- 1
dep/Makefile View File

@@ -12,6 +12,8 @@ ifdef ARCH_LIN
jansson = lib/libjansson.a
openssl = lib/libssl.a
libcurl = lib/libcurl.a
zstd = lib/libzstd.a
libarchive = lib/libarchive.a
libzip = lib/libzip.a
zlib = lib/libz.a
libspeexdsp = lib/libspeexdsp.a
@@ -26,6 +28,8 @@ ifdef ARCH_MAC
jansson = lib/libjansson.a
openssl = lib/libssl.a
libcurl = lib/libcurl.a
zstd = lib/libzstd.a
libarchive = lib/libarchive.a
libzip = lib/libzip.a
zlib = lib/libz.a
libspeexdsp = lib/libspeexdsp.a
@@ -40,6 +44,8 @@ ifdef ARCH_WIN
jansson = lib/libjansson.a
openssl = lib/libssl.a
libcurl = lib/libcurl.a
zstd = lib/libzstd.a
libarchive = lib/libarchive.a
libzip = lib/libzip.a
zlib = lib/libz.a
libspeexdsp = lib/libspeexdsp.a
@@ -58,6 +64,8 @@ DEPS += $(glew)
DEPS += $(glfw)
DEPS += $(jansson)
DEPS += $(libcurl)
DEPS += $(zstd)
DEPS += $(libarchive)
DEPS += $(libzip)
DEPS += $(libspeexdsp)
DEPS += $(libsamplerate)
@@ -134,6 +142,29 @@ $(libcurl): | $(openssl) curl-7.66.0
$(MAKE) -C curl-7.66.0
$(MAKE) -C curl-7.66.0 install

zstd-1.4.5:
$(WGET) "https://github.com/facebook/zstd/releases/download/v1.4.5/zstd-1.4.5.tar.gz"
$(SHA256) zstd-1.4.5.tar.gz 98e91c7c6bf162bf90e4e70fdbc41a8188b9fa8de5ad840c401198014406ce9e
$(UNTAR) zstd-1.4.5.tar.gz
rm zstd-1.4.5.tar.gz

$(zstd): | zstd-1.4.5
cd zstd-1.4.5/build/cmake && $(CMAKE) -DZSTD_BUILD_PROGRAMS=ON -DZSTD_BUILD_SHARED=ON -DZSTD_BUILD_STATIC=ON -DZSTD_MULTITHREAD_SUPPORT=OFF .
$(MAKE) -C zstd-1.4.5/build/cmake
$(MAKE) -C zstd-1.4.5/build/cmake install

libarchive-3.4.3:
$(WGET) "https://libarchive.org/downloads/libarchive-3.4.3.tar.gz"
$(SHA256) libarchive-3.4.3.tar.gz ee1e749213c108cb60d53147f18c31a73d6717d7e3d2481c157e1b34c881ea39
$(UNTAR) libarchive-3.4.3.tar.gz
rm libarchive-3.4.3.tar.gz

$(libarchive): | $(zstd) libarchive-3.4.3
cd libarchive-3.4.3 && $(CONFIGURE) --enable-shared=no --enable-static=yes --disable-bsdtar --disable-bsdcat --disable-bsdcpio --disable-posix-regex-lib --disable-xattr --disable-acl --without-zlib --without-bz2lib --without-libb2 --without-iconv --without-lz4 --without-lzma --without-cng --without-openssl --without-xml2 --without-expat
# cd libarchive-3.4.3 && $(CMAKE) -DENABLE_ACL:BOOL=OFF -DENABLE_BZip2:BOOL=OFF -DENABLE_CAT:BOOL=OFF -DENABLE_CNG:BOOL=OFF -DENABLE_COVERAGE:BOOL=OFF -DENABLE_CPIO:BOOL=OFF -DENABLE_EXPAT:BOOL=OFF -DENABLE_ICONV:BOOL=OFF -DENABLE_LIBB2:BOOL=OFF -DENABLE_LIBXML2:BOOL=OFF -DENABLE_LZ4:BOOL=OFF -DENABLE_LZMA:BOOL=OFF -DENABLE_LZO:BOOL=OFF -DENABLE_MBEDTLS:BOOL=OFF -DENABLE_NETTLE:BOOL=OFF -DENABLE_OPENSSL:BOOL=OFF -DENABLE_TAR:BOOL=OFF -DENABLE_TEST:BOOL=OFF -DENABLE_WERROR:BOOL=OFF -DENABLE_XATTR:BOOL=OFF -DENABLE_ZLIB:BOOL=OFF -DENABLE_ZSTD:BOOL=ON -DZSTD_INCLUDE_DIR:PATH=$(DEP_PATH)/include .
$(MAKE) -C libarchive-3.4.3
$(MAKE) -C libarchive-3.4.3 install

libzip-1.5.2:
$(WGET) "https://libzip.org/download/libzip-1.5.2.tar.gz"
$(SHA256) libzip-1.5.2.tar.gz be694a4abb2ffe5ec02074146757c8b56084dbcebf329123c84b205417435e15
@@ -252,7 +283,7 @@ $(pffft): | pffft

# Helpers

src: glew-2.1.0 glfw jansson-2.12 speexdsp-SpeexDSP-1.2rc3 openssl-1.1.1d curl-7.66.0 libzip-1.5.2 zlib-1.2.11 rtmidi-4.0.0 rtaudio nanovg nanosvg oui-blendish osdialog pffft
src: glew-2.1.0 glfw jansson-2.12 speexdsp-SpeexDSP-1.2rc3 openssl-1.1.1d curl-7.66.0 zstd-1.4.5 libarchive-3.4.3 libzip-1.5.2 zlib-1.2.11 rtmidi-4.0.0 rtaudio nanovg nanosvg oui-blendish osdialog pffft

clean:
git clean -fdx


Loading…
Cancel
Save