RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-24 07:42:17 +00:00
Code Issues Releases Wiki Activity

wscript: move install dirs setting to after C compiler check

Browse Source 
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.
This commit is contained in:
Ricardo Constantino 2016-11-16 15:18:11 +00:00
parent 03ea61c895
commit a3c27786c6
No known key found for this signature in database
GPG Key ID: EFD16019AE4FF531
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DOCS/compile-windows.md
View File

@ -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 configure CC=gcc.exe --check-c-compiler=gcc --enable-libmpv-shared --prefix=/mingw64
./waf install ./waf install
# waf installs libmpv to the wrong directory, so fix it up # waf installs libmpv dll to the wrong directory, so fix it up
mv -f /mingw64/bin/pkgconfig/mpv.pc /mingw64/lib/pkgconfig/ mv -f /mingw64/lib/mpv-1.dll /mingw64/bin/
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
``` ```
Linking libmpv with MSVC programs Linking libmpv with MSVC programs

12
wscript
View File

@ -1053,6 +1053,12 @@ def configure(ctx):
ctx.find_program('rst2pdf', var='RST2PDF', mandatory=False) ctx.find_program('rst2pdf', var='RST2PDF', mandatory=False)
ctx.find_program(windres, var='WINDRES', mandatory=False) ctx.find_program(windres, var='WINDRES', mandatory=False)
ctx.load('compiler_c')
ctx.load('waf_customizations')
ctx.load('dependencies')
ctx.load('detections.compiler')
ctx.load('detections.devices')
for ident, _, _ in _INSTALL_DIRS_LIST: for ident, _, _ in _INSTALL_DIRS_LIST:
varname = ident.upper() varname = ident.upper()
ctx.env[varname] = getattr(ctx.options, ident) ctx.env[varname] = getattr(ctx.options, ident)
@ -1061,12 +1067,6 @@ def configure(ctx):
while re.match('\$\{([^}]+)\}', ctx.env[varname]): while re.match('\$\{([^}]+)\}', ctx.env[varname]):
ctx.env[varname] = Utils.subst_vars(ctx.env[varname], ctx.env) ctx.env[varname] = Utils.subst_vars(ctx.env[varname], ctx.env)
ctx.load('compiler_c')
ctx.load('waf_customizations')
ctx.load('dependencies')
ctx.load('detections.compiler')
ctx.load('detections.devices')
ctx.parse_dependencies(build_options) ctx.parse_dependencies(build_options)
ctx.parse_dependencies(main_dependencies) ctx.parse_dependencies(main_dependencies)
ctx.parse_dependencies(audio_output_features) ctx.parse_dependencies(audio_output_features)