Changeset b201912 for scripts/build_mingw

Timestamp:

Apr 11, 2017, 1:49:44 AM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

04d0c89

Parents:

fbafd2c (diff), b762f8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into sampler

Fixed conflicts:

python/lib/gen_external.py
src/io/source_avcodec.c

File:

• scripts/build_mingw (modified) (4 diffs)

scripts/build_mingw

@@ -11 +11 @@
 set -x
 
-source VERSION
-VERSION="$AUBIO_MAJOR_VERSION.$AUBIO_MINOR_VERSION.$AUBIO_PATCH_VERSION"
-VERSION+="$AUBIO_VERSION_STATUS"
+python this_version.py -v
+VERSION=`python $PWD/this_version.py -v`
 
 FFMPEG_BUILDS_URL="https://ffmpeg.zeranoe.com/builds"
-FFMPEG_DEFAULT="20170315-6c4665d"
+FFMPEG_DEFAULT="20170404-1229007"
 
 # define some default CFLAGS
@@ -80 +79 @@
   CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
     ./waf distclean configure build install $WAFOPTS_TGT --testcmd='echo %s'
+  # fix dll location (see https://github.com/waf-project/waf/issues/1860)
+  mv $DESTDIR/lib/libaubio-5.dll $DESTDIR/bin
+  # generate def file (see https://github.com/aubio/aubio/issues/97)
+  ( echo -e "EXPORTS"; $NM $DESTDIR/bin/libaubio-5.dll | grep T\  | \
+    egrep "(aubio|fvec|cvec|lvec|fmat)" | sed 's/^.* T _\?//' ) \
+    > $DESTDIR/bin/libaubio-5.def
   zip -r $DESTDIR.zip `basename $DESTDIR`
   rm -rf $DESTDIR
@@ -88 +93 @@
   TARGET=win32
   export CC=i686-w64-mingw32-gcc
+  export NM=i686-w64-mingw32-nm
   build_mingw
 }
@@ -94 +100 @@
   TARGET=win64
   export CC=x86_64-w64-mingw32-gcc
+  export NM=x86_64-w64-mingw32-nm
   build_mingw
 }