From 1206050e4c315235fb687513ed83bb01280e257a Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Wed, 22 Sep 2021 01:03:09 -0400 Subject: [PATCH] Fix libarchive linking on Windows. --- Makefile | 2 +- dep/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4167a1dd..22580567 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,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/libarchive.a dep/lib/libzstd.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_static.a dep/lib/libzstd.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 diff --git a/dep/Makefile b/dep/Makefile index b944092c..8b70a1df 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -41,7 +41,7 @@ ifdef ARCH_WIN openssl = lib/libssl.a libcurl = lib/libcurl.a zstd = lib/libzstd.a - libarchive = lib/libarchive.a + libarchive = lib/libarchive_static.a libspeexdsp = lib/libspeexdsp.a libsamplerate = lib/libsamplerate.a rtmidi = lib/librtmidi.a