diff options
Diffstat (limited to 'o3d/build')
| -rw-r--r-- | o3d/build/common.gypi | 8 | ||||
| -rwxr-xr-x | o3d/build/gyp_o3d | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi index 9184c53..a24623f 100644 --- a/o3d/build/common.gypi +++ b/o3d/build/common.gypi @@ -161,6 +161,13 @@ ], # Disable warning: "'this' : used in base member initialization list." 'msvs_disabled_warnings': [4355], + 'msvs_settings': { + 'VCCLCompilerTool': { + 'WarnAsError': 'false', + # Turn off errors for signed/unsigned mismatch from Chromium build/common.gypi. + 'AdditionalOptions!': ['/we4389'], + }, + }, }, }, ], @@ -188,6 +195,7 @@ '-fno-eliminate-unused-debug-symbols', '-mmacosx-version-min=10.5'], 'WARNING_CFLAGS': ['-Wno-deprecated-declarations'], + 'WARNING_CFLAGS!': ['-Wall', '-Wextra'], 'WARNING_CXXFLAGS': ['-Wstrict-aliasing', '-Wno-deprecated',], }, diff --git a/o3d/build/gyp_o3d b/o3d/build/gyp_o3d index 229b4bc..6cfcaf3 100755 --- a/o3d/build/gyp_o3d +++ b/o3d/build/gyp_o3d @@ -26,7 +26,8 @@ if __name__ == '__main__': args += ['--depth', '.', '-I', os.path.join(chrome_src, 'build', 'common.gypi'), '-I', os.path.join(o3d_src, 'build', 'common_global.gypi'), - '-D', 'mac_deployment_target=10.4'] + '-D', 'mac_deployment_target=10.4', + '-D', 'linux_use_tcmalloc=0'] # Off we go... sys.exit(gyp.main(args)) |