From 76c5afc25b331cf98c63c6e313a90cd98c575858 Mon Sep 17 00:00:00 2001 From: Anton Mitrofanov Date: Mon, 22 Apr 2019 22:18:01 +0300 Subject: [PATCH] Fix MSVS build with ./configure --enable-shared --system-libx264 --- Makefile | 2 ++ configure | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b35bf2fd..8c842d6c 100644 --- a/Makefile +++ b/Makefile @@ -246,6 +246,8 @@ $(LIBX264): $(GENERATED) .depend $(OBJS) $(OBJASM) $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO) $(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS) +$(IMPLIBNAME): $(SONAME) + ifneq ($(EXE),) .PHONY: x264 checkasm8 checkasm10 example x264: x264$(EXE) diff --git a/configure b/configure index 4e5fc2bb..ec767fbb 100755 --- a/configure +++ b/configure @@ -1374,7 +1374,11 @@ ${SRCPATH}/version.sh >> x264_config.h if [ "$cli_libx264" = "system" ] ; then if [ "$shared" = "yes" ]; then - CLI_LIBX264='$(SONAME)' + if [ "$SYS" = "WINDOWS" -o "$SYS" = "CYGWIN" ]; then + CLI_LIBX264='$(IMPLIBNAME)' + else + CLI_LIBX264='$(SONAME)' + fi CFLAGSCLI="$CFLAGSCLI -DX264_API_IMPORTS" else CLI_LIBX264= -- 2.40.0