diff options
| author | wm4 <wm4@nowhere> | 2015-01-07 21:33:14 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-01-25 17:00:18 +0900 |
| commit | f4a9c9424f968eb642a2c953ed4588913bdfae1d (patch) | |
| tree | 632bc3a86baf652d0f021bae1002c1b608df230f /video/out | |
| parent | d9da0c9ce9105b2097d9463e4787b5fac56412cf (diff) | |
| download | mpv-f4a9c9424f968eb642a2c953ed4588913bdfae1d.tar.bz2 mpv-f4a9c9424f968eb642a2c953ed4588913bdfae1d.tar.xz | |
win32: request UTF-16 API variants, Vista+ APIs, and COM C macros
Put the Vista+ (_WIN32_WINNT) and the COM C (COBJMACROS) defines into
the build system, instead of defining them over and over in the code.
Conflicts:
video/out/w32_common.c
waftools/checks/custom.py
Diffstat (limited to 'video/out')
| -rw-r--r-- | video/out/gl_w32.c | 2 | ||||
| -rw-r--r-- | video/out/w32_common.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/video/out/gl_w32.c b/video/out/gl_w32.c index 79e3165b39..abdea60775 100644 --- a/video/out/gl_w32.c +++ b/video/out/gl_w32.c @@ -81,7 +81,7 @@ static void *w32gpa(const GLubyte *procName) void *res = wglGetProcAddress(procName); if (res) return res; - oglmod = GetModuleHandle("opengl32.dll"); + oglmod = GetModuleHandle(L"opengl32.dll"); return GetProcAddress(oglmod, procName); } diff --git a/video/out/w32_common.c b/video/out/w32_common.c index c67308528d..de114d3243 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -16,7 +16,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _WIN32_WINNT 0x0600 #include <stdio.h> #include <limits.h> #include <pthread.h> |