Skip to content

A
angle
Commit 190f882b by shannon.woods@transgaming.com
Options

Make other angle targets compile on Win64

Addendum to https://codereview.appspot.com/7011048/ BUG=391, chromium:166496, chromium:167187 Landing for jschuh Original patch: https://codereview.appspot.com/7075044/ Review URL: https://codereview.appspot.com/7190044 git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1781 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 24966731
Showing with 10 additions and 0 deletions
src/build_angle.gypi
...@@ -146,6 +146,8 @@ ...@@ -146,6 +146,8 @@
], ],
'conditions': [ 'conditions': [
['OS=="win"', { ['OS=="win"', {
# TODO(jschuh): http://crbug.com/167187 size_t -> int
'msvs_disabled_warnings': [ 4267 ],
'sources': ['compiler/ossource_win.cpp'], 'sources': ['compiler/ossource_win.cpp'],
}, { # else: posix }, { # else: posix
'sources': ['compiler/ossource_posix.cpp'], 'sources': ['compiler/ossource_posix.cpp'],
...@@ -179,6 +181,8 @@ ...@@ -179,6 +181,8 @@
'compiler/VersionGLSL.cpp', 'compiler/VersionGLSL.cpp',
'compiler/VersionGLSL.h', 'compiler/VersionGLSL.h',
], ],
# TODO(jschuh): http://crbug.com/167187 size_t -> int
'msvs_disabled_warnings': [ 4267 ],
}, },
], ],
'conditions': [ 'conditions': [
...@@ -209,6 +213,8 @@ ...@@ -209,6 +213,8 @@
'compiler/SearchSymbol.cpp', 'compiler/SearchSymbol.cpp',
'compiler/SearchSymbol.h', 'compiler/SearchSymbol.h',
], ],
# TODO(jschuh): http://crbug.com/167187 size_t -> int
'msvs_disabled_warnings': [ 4267 ],
}, },
{ {
'target_name': 'libGLESv2', 'target_name': 'libGLESv2',
...@@ -330,6 +336,8 @@ ...@@ -330,6 +336,8 @@
'libGLESv2/utilities.cpp', 'libGLESv2/utilities.cpp',
'libGLESv2/utilities.h', 'libGLESv2/utilities.h',
], ],
# TODO(jschuh): http://crbug.com/167187 size_t -> int
'msvs_disabled_warnings': [ 4267 ],
'msvs_settings': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'], 'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
...@@ -368,6 +376,8 @@ ...@@ -368,6 +376,8 @@
'libEGL/Surface.cpp', 'libEGL/Surface.cpp',
'libEGL/Surface.h', 'libEGL/Surface.h',
], ],
# TODO(jschuh): http://crbug.com/167187 size_t -> int
'msvs_disabled_warnings': [ 4267 ],
'msvs_settings': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'], 'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment