diff options
| author | feixm1 <michal@feix.cz> | 2017-08-08 00:00:02 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-08-08 11:41:56 +0200 |
| commit | a434892208559232d108b512f9ed30527e646d9d (patch) | |
| tree | e38b74e6759b0d57a2d941ce255986ac6292a85b | |
| parent | c1bcd30b09b45d5844f5296f2a08c9aa09b3ff43 (diff) | |
| download | mpv-a434892208559232d108b512f9ed30527e646d9d.tar.bz2 mpv-a434892208559232d108b512f9ed30527e646d9d.tar.xz | |
build: fix dependencies for Cygwin environment
This replaces previous commit with same intentions. This time, with
proper formating (no tabs in code).
| -rw-r--r-- | wscript | 2 | ||||
| -rw-r--r-- | wscript_build.py | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -548,7 +548,7 @@ audio_output_features = [ }, { 'name': '--wasapi', 'desc': 'WASAPI audio output', - 'deps': ['os-win32'], + 'deps_any': ['os-win32', 'os-cygwin'], 'func': check_cc(fragment=load_fragment('wasapi.c')), } ] diff --git a/wscript_build.py b/wscript_build.py index 850c03dc14..5c24dd7d60 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -120,9 +120,9 @@ def build(ctx): ctx(features = "ebml_definitions", target = "ebml_defs.c") main_fn_c = ctx.pick_first_matching_dep([ + ( "osdep/main-fn-unix.c", "posix" ), ( "osdep/main-fn-win.c", "win32-desktop" ), ( "osdep/main-fn-cocoa.c", "cocoa" ), - ( "osdep/main-fn-unix.c" ), ]) getch2_c = ctx.pick_first_matching_dep([ @@ -466,12 +466,12 @@ def build(ctx): ( "osdep/path-macosx.m", "cocoa" ), ( "osdep/path-unix.c"), ( "osdep/path-win.c", "win32-desktop" ), - ( "osdep/path-win.c", "os-cygwin" ), ( "osdep/path-uwp.c", "uwp" ), ( "osdep/glob-win.c", "glob-win32" ), ( "osdep/w32_keyboard.c", "os-win32" ), ( "osdep/w32_keyboard.c", "os-cygwin" ), ( "osdep/windows_utils.c", "os-win32" ), + ( "osdep/windows_utils.c", "os-cygwin" ), ( "osdep/mpv.rc", "win32-executable" ), ( "osdep/win32/pthread.c", "win32-internal-pthreads"), ( "osdep/android/strnlen.c", "android"), |