Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
1,609 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| 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 <string.h> | ||
| #include <algorithm> | ||
| #include <limits> | ||
| +#include <intrin.h> | ||
|
|
||
| #include <anglebase/numerics/safe_math.h> | ||
|
|
||
| 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', | ||
| { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --- CMakeLists.txt.orig 2018-06-04 20:56:55.854029300 +0100 | ||
| +++ CMakeLists.txt 2018-06-04 20:58:02.399678900 +0100 | ||
| @@ -142,12 +142,12 @@ | ||
|
|
||
| # For MinGW cross compile, statically link to the C++ runtime. | ||
| # But it still depends on MSVCRT.dll. | ||
| - if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") | ||
| - if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") | ||
| - set_target_properties(${TARGET} PROPERTIES | ||
| - LINK_FLAGS -static -static-libgcc -static-libstdc++) | ||
| - endif() | ||
| - endif() | ||
| + #if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") | ||
| + # if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") | ||
| + # set_target_properties(${TARGET} PROPERTIES | ||
| + # LINK_FLAGS -static -static-libgcc -static-libstdc++) | ||
| + # endif() | ||
| + #endif() | ||
| endfunction() | ||
|
|
||
| if(NOT COMMAND find_host_package) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| --- StandAlone/CMakeLists.txt.orig 2018-06-04 21:21:02.304015300 +0100 | ||
| +++ StandAlone/CMakeLists.txt 2018-06-04 21:21:31.345615600 +0100 | ||
| @@ -44,9 +44,9 @@ | ||
|
|
||
| install(TARGETS spirv-remap | ||
| RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
| - | ||
| + | ||
| if(BUILD_SHARED_LIBS) | ||
| install(TARGETS glslang-default-resource-limits | ||
| - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
| + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
| endif() | ||
| endif(ENABLE_GLSLANG_INSTALL) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| --- CMakeLists.txt.orig 2018-06-07 12:17:32.435758800 +0100 | ||
| +++ CMakeLists.txt 2018-06-07 12:18:27.861816500 +0100 | ||
| @@ -79,10 +79,11 @@ | ||
| function(glslang_set_link_args TARGET) | ||
| # For MinGW compiles, statically link against the GCC and C++ runtimes. | ||
| # This avoids the need to ship those runtimes as DLLs. | ||
| - if(WIN32 AND ${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") | ||
| - set_target_properties(${TARGET} PROPERTIES | ||
| - LINK_FLAGS "-static -static-libgcc -static-libstdc++") | ||
| - endif() | ||
| + # JW addition: we are happy to ship DLLs. | ||
| + #if(WIN32 AND ${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") | ||
| + # set_target_properties(${TARGET} PROPERTIES | ||
| + # LINK_FLAGS "-static -static-libgcc -static-libstdc++") | ||
| + #endif() | ||
| endfunction(glslang_set_link_args) | ||
|
|
||
| # We depend on these for later projects, so they should come first. | ||
| @@@--- StandAlone/CMakeLists.txt.orig 2018-06-09 09:36:48.489868600 +0100 | ||
| @@@+++ StandAlone/CMakeLists.txt 2018-06-09 09:37:10.333816200 +0100 | ||
| @@@@@ -44,9 +44,9 @@ | ||
| @@@ | ||
| @@@ install(TARGETS spirv-remap | ||
| @@@ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
| @@@- | ||
| @@@+ | ||
| @@@ if(BUILD_SHARED_LIBS) | ||
| @@@ install(TARGETS glslang-default-resource-limits | ||
| @@@- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
| @@@+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
| @@@ endif() | ||
| @@@ endif(ENABLE_GLSLANG_INSTALL) | ||
| --- hlsl/CMakeLists.txt.orig 2018-06-09 09:48:49.042537000 +0100 | ||
| +++ hlsl/CMakeLists.txt 2018-06-09 09:49:19.293688500 +0100 | ||
| @@ -20,6 +20,7 @@ | ||
| add_library(HLSL ${LIB_TYPE} ${SOURCES} ${HEADERS}) | ||
| set_property(TARGET HLSL PROPERTY FOLDER hlsl) | ||
| set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON) | ||
| +target_link_libraries(glslang) | ||
|
|
||
| if(WIN32 AND BUILD_SHARED_LIBS) | ||
| set_target_properties(HLSL PROPERTIES PREFIX "") |
Oops, something went wrong.