summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2014-03-22 11:32:36 (GMT)
committerTony Theodore <tonyt@logyst.com>2014-03-22 11:32:36 (GMT)
commit2d9725a08318c9ce72c1e433d617b8fa473d5557 (patch)
treead3ab480be721e2267f5763acb9d465dcc16482d /src
parentf9c4ed39d20f68a2eb5b73a91350810a0243faf9 (diff)
parent83dfecd42ecb40ada8ccda1e11344a0c59091519 (diff)
downloadmxe-2d9725a08318c9ce72c1e433d617b8fa473d5557.zip
mxe-2d9725a08318c9ce72c1e433d617b8fa473d5557.tar.gz
mxe-2d9725a08318c9ce72c1e433d617b8fa473d5557.tar.bz2
Merge pull request #348 from TimothyGu/parallel
Allow building packages for different targets simultaneously using multiple `make` instances
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