Browse Source

Fix libarchive linking on Windows.

tags/v2.0.0
Andrew Belt 3 years ago
parent
commit
1206050e4c
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      Makefile
  2. +1
    -1
      dep/Makefile

+ 1
- 1
Makefile View File

@@ -70,7 +70,7 @@ ifdef ARCH_WIN
LDFLAGS += -Wl,--export-all-symbols LDFLAGS += -Wl,--export-all-symbols
LDFLAGS += -Wl,--out-implib,$(TARGET).a LDFLAGS += -Wl,--out-implib,$(TARGET).a
LDFLAGS += -Wl,-Bstatic -Wl,--whole-archive 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 += -Wl,-Bdynamic -Wl,--no-whole-archive
LDFLAGS += -lpthread -lopengl32 -lgdi32 -lws2_32 -lcomdlg32 -lole32 -ldsound -lwinmm -lksuser -lshlwapi -lmfplat -lmfuuid -lwmcodecdspuuid -ldbghelp LDFLAGS += -lpthread -lopengl32 -lgdi32 -lws2_32 -lcomdlg32 -lole32 -ldsound -lwinmm -lksuser -lshlwapi -lmfplat -lmfuuid -lwmcodecdspuuid -ldbghelp




+ 1
- 1
dep/Makefile View File

@@ -41,7 +41,7 @@ ifdef ARCH_WIN
openssl = lib/libssl.a openssl = lib/libssl.a
libcurl = lib/libcurl.a libcurl = lib/libcurl.a
zstd = lib/libzstd.a zstd = lib/libzstd.a
libarchive = lib/libarchive.a
libarchive = lib/libarchive_static.a
libspeexdsp = lib/libspeexdsp.a libspeexdsp = lib/libspeexdsp.a
libsamplerate = lib/libsamplerate.a libsamplerate = lib/libsamplerate.a
rtmidi = lib/librtmidi.a rtmidi = lib/librtmidi.a


Loading…
Cancel
Save