diff options
| author | Ricardo Constantino <wiiaboo@gmail.com> | 2016-11-16 15:18:11 +0000 |
|---|---|---|
| committer | Ricardo Constantino <wiiaboo@gmail.com> | 2016-11-16 17:29:22 +0000 |
| commit | a3c27786c6aeac55942a805281f45a1571d899f4 (patch) | |
| tree | 52705da7f70c6053d0ec294f0f3a28a43d8d7310 /DOCS | |
| parent | 03ea61c89563a5bb6b9072fcd89f1e577cf0fcbf (diff) | |
| download | mpv-a3c27786c6aeac55942a805281f45a1571d899f4.tar.bz2 mpv-a3c27786c6aeac55942a805281f45a1571d899f4.tar.xz | |
wscript: move install dirs setting to after C compiler check
This fixes waf setting the wrong LIBDIR for DEST_OS=win32 in
waflib/Tools/c_config.py:get_cc_version()
Any scripts assuming the implib and pkgconfig are in the wrong
place should be changed to move the .dll instead.
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/compile-windows.md | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/DOCS/compile-windows.md b/DOCS/compile-windows.md index e283460674..f0d0dca50d 100644 --- a/DOCS/compile-windows.md +++ b/DOCS/compile-windows.md @@ -166,11 +166,8 @@ Or, compile and install both libmpv and mpv: ./waf configure CC=gcc.exe --check-c-compiler=gcc --enable-libmpv-shared --prefix=/mingw64 ./waf install -# waf installs libmpv to the wrong directory, so fix it up -mv -f /mingw64/bin/pkgconfig/mpv.pc /mingw64/lib/pkgconfig/ -mv -f /mingw64/bin/libmpv.dll.a /mingw64/lib/ -sed -i 's_/mingw64/bin_/mingw64/lib_' /mingw64/lib/pkgconfig/mpv.pc -rmdir /mingw64/bin/pkgconfig +# 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 |