diff options
| author | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-04-13 19:55:48 +0900 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-04-13 19:55:48 +0900 |
| commit | 3287825bd2ee762a918961383604697358765397 (patch) | |
| tree | d3513ec0b91a5c3832221c5b74225deb85fb2163 /wscript_build.py | |
| parent | 9e65b5db0bf79b31c7816d1fdba77ea18fe82690 (diff) | |
| parent | f43017bfe97c07aa73206d8d1388294cdbee628f (diff) | |
| download | mpv-3287825bd2ee762a918961383604697358765397.tar.bz2 mpv-3287825bd2ee762a918961383604697358765397.tar.xz | |
Merge branch 'master' into release/0.9
* master: (39 commits)
Update license headers
af_lavrresample: minor simplification
af_lavrresample: allow resetting output sample format
audio/filter: fully renegotiate audio formats on every reconfig
DOCS/waf: Edit --enable-feature sentences
vo_opengl: slightly simplify check_gl_features()
vo_opengl: unify blend-subtitles-res and blend-subtitles
vo_opengl: fix blend-subtitles-res=video & anamorphic video
manpage: mention how pseudo-gui mode is enabled on win32
main-fn-win: fix handle validity check for XP
win32: use pseudo-gui profile when started without stdio
win32: only attach to the console from mpv.com
win32: use a platform-specific unicode entry-point
vo_opengl: add blend-subtitles-res
manpage: document pseudo-gui stuff
mp_image: remove redundant flags field
mp_image: remove redundant chroma_x/y_shift fields
mp_image: remove redundant plane_w/h fields
player: use config parser for setting up pseudo-gui profile
player: change pseudo-gui settings
...
Diffstat (limited to 'wscript_build.py')
| -rw-r--r-- | wscript_build.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wscript_build.py b/wscript_build.py index 20a2633d99..4478725596 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -71,6 +71,10 @@ def build(ctx): source = "demux/ebml.c", target = "ebml_defs.c") + main_fn_c = { + 'win32': 'player/main-fn-win.c', + }.get(ctx.env.DEST_OS, "player/main-fn-unix.c") + getch2_c = { 'win32': 'osdep/terminal-win.c', }.get(ctx.env.DEST_OS, "osdep/terminal-unix.c") @@ -418,7 +422,7 @@ def build(ctx): if ctx.dependency_satisfied('cplayer'): ctx( target = "mpv", - source = "player/main_fn.c", + source = main_fn_c, use = ctx.dependencies_use() + ['objects'], includes = _all_includes(ctx), features = "c cprogram", |