summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2014-03-21 02:56:52 (GMT)
committerTimothy Gu <timothygu99@gmail.com>2014-03-21 02:59:40 (GMT)
commit83dfecd42ecb40ada8ccda1e11344a0c59091519 (patch)
treec72f99400dcf76682bef0df53b7d41f9b71aa045 /src
parent8d877bdc75063c6f5d4ba9bd0336c22e1027f334 (diff)
downloadmxe-83dfecd42ecb40ada8ccda1e11344a0c59091519.zip
mxe-83dfecd42ecb40ada8ccda1e11344a0c59091519.tar.gz
mxe-83dfecd42ecb40ada8ccda1e11344a0c59091519.tar.bz2
Fix libxvidcore shared DLL location
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/xvidcore.mk10
1 files 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