diff --git a/src/angle.gyp b/src/angle.gyp index 4095547..3db4840 100644 --- a/src/angle.gyp +++ b/src/angle.gyp @@ -76,7 +76,7 @@ [ { 'destination': '<(angle_gen_path)', - 'files': [ 'copy_compiler_dll.bat', '<(angle_id_script_base)' ], + 'files': [ '<(angle_id_script_base)' ], }, ], 'conditions': @@ -206,10 +206,10 @@ 'outputs': [ '<(PRODUCT_DIR)/d3dcompiler_47.dll' ], 'action': [ - "<(angle_gen_path)/copy_compiler_dll.bat", - "$(PlatformName)", - "<(windows_sdk_path)", - "<(PRODUCT_DIR)" +# "<(angle_gen_path)/copy_compiler_dll.bat", +# "$(PlatformName)", +# "<(windows_sdk_path)", +# "<(PRODUCT_DIR)" ], }, ], #actions diff --git a/src/common/mathutil.h b/src/common/mathutil.h index e096b1a..716aeb6 100644 --- a/src/common/mathutil.h +++ b/src/common/mathutil.h @@ -16,6 +16,7 @@ #include #include #include +#include #include diff --git a/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h b/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h index c4b79ee..f22609b 100644 --- a/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h +++ b/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h @@ -23,7 +23,7 @@ typedef HGLRC(WINAPI *PFNWGLCREATELAYERCONTEXTPROC)(HDC, int); typedef BOOL(WINAPI *PFNWGLDELETECONTEXTPROC)(HGLRC); typedef HGLRC(WINAPI *PFNWGLGETCURRENTCONTEXTPROC)(VOID); typedef HDC(WINAPI *PFNWGLGETCURRENTDCPROC)(VOID); -typedef PROC(WINAPI *PFNWGLGETPROCADDRESSPROC)(LPCSTR); +typedef void*(WINAPI *PFNWGLGETPROCADDRESSPROC)(LPCSTR); typedef BOOL(WINAPI *PFNWGLMAKECURRENTPROC)(HDC, HGLRC); typedef BOOL(WINAPI *PFNWGLSHARELISTSPROC)(HGLRC, HGLRC); typedef BOOL(WINAPI *PFNWGLUSEFONTBITMAPSAPROC)(HDC, DWORD, DWORD, DWORD); diff --git a/util/util.gyp b/util/util.gyp index bda8a0530..2a87e57e7 100644 --- a/util/util.gyp +++ b/util/util.gyp @@ -118,6 +118,13 @@ [ '<@(util_win32_sources)', ], + 'link_settings': + { + 'libraries': + [ + '-lgdi32', + ] + }, }], ['OS=="win" and angle_build_winrt==1', {