shithub: openh264

Info  •  Files  •  Log  •  Branches

Install the import library via the EXTRA_LIB mechanism on mingw as well

Prior to 3f69873c99, there already was a mechanism for installing
the import library, used for the MSVC builds. Use that for mingw
as well, instead of adding more hardcoded rules.

--- a/Makefile

+++ b/Makefile

@@ -234,10 +234,6 @@

 	if [ -L $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) ]; then \

 		cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(SHAREDLIB_DIR); \

 	fi

-	if [ -f $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX).a ]; then \

-		install -m 644 $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX).a \

-			$(PREFIX)/lib; \

-	fi

 	mkdir -p $(PREFIX)/lib/pkgconfig

 	install -m 444 $(PROJECT_NAME).pc $(PREFIX)/lib/pkgconfig

 ifneq ($(EXTRA_LIBRARY),)

--- a/build/platform-mingw_nt.mk

+++ b/build/platform-mingw_nt.mk

@@ -2,7 +2,8 @@

 SHAREDLIB_DIR = $(PREFIX)/bin

 SHAREDLIBSUFFIX = dll

 SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX)

-SHLDFLAGS = -Wl,--out-implib,$(LIBPREFIX)$(PROJECT_NAME).dll.a

+EXTRA_LIBRARY=$(LIBPREFIX)$(PROJECT_NAME).dll.a

+SHLDFLAGS = -Wl,--out-implib,$(EXTRA_LIBRARY)

 CFLAGS += -MMD -MP

 LDFLAGS +=

 ifeq ($(ENABLE64BIT), Yes)