diff options
| -rw-r--r-- | base/allocator/allocator.gyp | 2 | ||||
| -rw-r--r-- | build/internal/release_defaults.gypi | 2 | ||||
| -rw-r--r-- | chrome_frame/chrome_frame_launcher.gyp | 4 | ||||
| -rw-r--r-- | chrome_frame/crash_reporting/crash_reporting.gyp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 64b1159..87b4127 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -248,7 +248,7 @@ ], 'msvs_settings': { # TODO(sgk): merge this with build/common.gypi settings - 'VCLibrarianTool=': { + 'VCLibrarianTool': { 'AdditionalOptions': ['/ignore:4006,4221'], 'AdditionalLibraryDirectories': ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], diff --git a/build/internal/release_defaults.gypi b/build/internal/release_defaults.gypi index 5aa2b75..1bf6bbe 100644 --- a/build/internal/release_defaults.gypi +++ b/build/internal/release_defaults.gypi @@ -1,7 +1,7 @@ { 'msvs_settings': { 'VCCLCompilerTool': { - 'Optimizations': '2', + 'Optimization': '2', 'StringPooling': 'true', 'OmitFramePointers': 'true', }, diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp index cafe850..53bab2c 100644 --- a/chrome_frame/chrome_frame_launcher.gyp +++ b/chrome_frame/chrome_frame_launcher.gyp @@ -123,7 +123,7 @@ # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. 'SubSystem': '2', }, - }, + }, }, { 'target_name': 'chrome_frame_helper_dll', @@ -158,7 +158,7 @@ 'msvs_settings': { 'VCLinkerTool': { 'OutputFile': '$(OutDir)\\chrome_frame_helper.dll', - 'ProgramDataBaseFile': '$(OutDir)\\chrome_frame_helper_dll.pdb', + 'ProgramDatabaseFile': '$(OutDir)\\chrome_frame_helper_dll.pdb', # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. 'SubSystem': '2', 'AdditionalDependencies': [ diff --git a/chrome_frame/crash_reporting/crash_reporting.gyp b/chrome_frame/crash_reporting/crash_reporting.gyp index 8239a1a65..2ec1eb0 100644 --- a/chrome_frame/crash_reporting/crash_reporting.gyp +++ b/chrome_frame/crash_reporting/crash_reporting.gyp @@ -48,7 +48,7 @@ # entry point for the DLL. 'VCLinkerTool': { 'EntryPointSymbol': 'DllMain', - 'IgnoreAllDefaultLibraries': 1, + 'IgnoreAllDefaultLibraries': 'true', }, # Turn off buffer security checks, since we don't have CRT # support for them, given that we don't link the CRT. |