From 83dfecd42ecb40ada8ccda1e11344a0c59091519 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 20 Mar 2014 19:56:52 -0700 Subject: Fix libxvidcore shared DLL location Signed-off-by: Timothy Gu --- src/xvidcore.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/xvidcore.mk b/src/xvidcore.mk index ef2933e..f80f6b8 100644 --- a/src/xvidcore.mk +++ b/src/xvidcore.mk @@ -17,15 +17,19 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && autoconf + $(SED) -i 's,yasm_prog="yasm",yasm_prog="$(TARGET)-yasm",' '$(1)/configure.in' + cd '$(1)' && autoreconf -fi cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) $(MAKE) -C '$(1)' -j 1 BUILD_DIR='build' $(if $(BUILD_STATIC),SHARED,STATIC)_LIB= $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' $(INSTALL) -m644 '$(1)/../../src/xvid.h' '$(PREFIX)/$(TARGET)/include/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/build/xvidcore.$(LIB_SUFFIX)' '$(PREFIX)/$(TARGET)/lib/' - ln -sf '$(PREFIX)/$(TARGET)/lib/xvidcore.$(LIB_SUFFIX)' '$(PREFIX)/$(TARGET)/lib/libxvidcore.$(LIB_SUFFIX)' + $(INSTALL) -m644 '$(1)/build/xvidcore.$(LIB_SUFFIX)' '$(PREFIX)/$(TARGET)/bin/' + $(if $(BUILD_STATIC), \ + ln -sf '$(PREFIX)/$(TARGET)/lib/xvidcore.$(LIB_SUFFIX)' '$(PREFIX)/$(TARGET)/lib/libxvidcore.$(LIB_SUFFIX)', \ + mv '$(1)/build/xvidcore.dll.a' '$(1)/build/libxvidcore.dll.a' && \ + $(INSTALL) -m644 '$(1)/build/libxvidcore.dll.a' '$(PREFIX)/$(TARGET)/lib/') endef define $(PKG)_BUILD_x86_64-w64-mingw32 -- cgit v0.12