wscript_build: install shared libmpv to BINDIR for Win32

This commit is contained in:
Ricardo Constantino 2017-04-24 15:05:22 +01:00
parent 809d160c1e
commit 6d65ab3a7d
No known key found for this signature in database
GPG Key ID: EFD16019AE4FF531
2 changed files with 4 additions and 3 deletions

View File

@ -165,9 +165,6 @@ Or, compile and install both libmpv and mpv:
```bash
./waf configure CC=gcc.exe --check-c-compiler=gcc --enable-libmpv-shared --prefix=/mingw64
./waf install
# waf installs libmpv dll to the wrong directory, so fix it up
mv -f /mingw64/lib/mpv-1.dll /mingw64/bin/
```
Linking libmpv with MSVC programs

View File

@ -544,6 +544,7 @@ def build(ctx):
"features": features,
"export_symbols_def": "libmpv/mpv.def",
"install_path": ctx.env.LIBDIR,
"install_path_implib": ctx.env.LIBDIR,
}
if shared and ctx.dependency_satisfied('android'):
@ -556,6 +557,9 @@ def build(ctx):
# for all other configurations we want SONAME to be used
libmpv_kwargs["vnum"] = libversion
if shared and ctx.env.DEST_OS == 'win32':
libmpv_kwargs["install_path"] = ctx.env.BINDIR
ctx(**libmpv_kwargs)
if build_shared: