Mercurial > mxe-octave

diff src/libvpx.mk @ 4024:8114d05101dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ffmpeg: update to v2.7.2 * src/ffmpeg.mk: update version, checksum, add native vs cross build rules * src/xvidcore.mk: fix typo in install of .dll.a * src/libvpx.mk: set target based on build options
author John Donoghue
date Fri, 11 Sep 2015 15:22:10 -0400
parents 6426e08a5618
children 28fa86d2cf21
line wrap: on
line diff
--- a/src/libvpx.mk	Mon Sep 07 13:46:45 2015 -0400
+++ b/src/libvpx.mk	Fri Sep 11 15:22:10 2015 -0400
@@ -10,6 +10,17 @@
 $(PKG)_URL      := http://webm.googlecode.com/files/$($(PKG)_FILE)
 $(PKG)_DEPS     := pthreads
 
+$(PKG)_TARGET_OPTS := 
+
+ifeq ($(MXE_NATIVE_BUILD),no)
+  ifeq ($(ENABLE_WINDOWS_64),yes)
+    $(PKG)_TARGET_OPTS := --target=x86_64-win64-gcc 
+  else
+    $(PKG)_TARGET_OPTS := --target=x86-win32-gcc 
+  endif
+endif
+
+
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://code.google.com/p/webm/downloads/list?sort=-uploaded' | \
     $(SED) -n 's,.*libvpx-v\([0-9][^<]*\)\.tar.*,\1,p' | \
@@ -21,7 +32,7 @@
         CROSS='$(MXE_TOOL_PREFIX)' \
         ./configure \
         --prefix='$(HOST_PREFIX)' \
-        --target=x86-win32-gcc \
+        $($(PKG)_TARGET_OPTS) \
         --disable-examples \
         --disable-install-docs
     $(MAKE) -C '$(1)' -j '$(JOBS)'