diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-09-28 14:32:01 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-09-28 14:32:01 +0000 |
| commit | 8b5abeca877b2d6cb474ce85ed44fcef8e3f2508 (patch) | |
| tree | 852cbdca2e6a4903f4ff6d2d9072e97dfa5968b0 /gyp | |
| parent | ade907bf9843c626e66c739ee12479024497effe (diff) | |
Set window build flags (warn level 4, release optimization options, pdbs in release builds)
Review URL: http://codereview.appspot.com/5142050/
git-svn-id: http://skia.googlecode.com/svn/trunk@2346 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index add8a62eac..9ea490ee35 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -8,6 +8,7 @@ 'defines': [ 'SK_BUILD_FOR_WIN32', 'SK_IGNORE_STDINT_DOT_H', + '_CRT_SECURE_NO_WARNINGS', ], 'msvs_cygwin_shell': 0, 'msvs_settings': { @@ -28,26 +29,40 @@ 'Debug': { 'msvs_settings': { 'VCCLCompilerTool': { - 'DebugInformationFormat': '1', # debugOldStyleInfo (/Z7) + 'DebugInformationFormat': '4', # editAndContiue (/ZI) + 'ProgramDataBaseFileName': '$(OutDir)$(ProjectName).pdb', 'Optimization': '0', # optimizeDisabled (/Od) 'PreprocessorDefinitions': ['_DEBUG'], 'RuntimeLibrary': '3', # rtMultiThreadedDebugDLL (/MDd) + 'ExceptionHandling': '0', + 'RuntimeTypeInfo': 'false', # /GR- + 'WarningLevel': '3', # level3 (/W3) }, 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', + 'GenerateDebugInformation': 'true', # /DEBUG + 'LinkIncremental': '2', # /INCREMENTAL }, }, }, 'Release': { 'msvs_settings': { 'VCCLCompilerTool': { - 'DebugInformationFormat': '0', # debugDisabled - 'Optimization': '2', # optimizeMaxSpeed (/O2) + 'DebugInformationFormat': '3', # programDatabase (/Zi) + 'ProgramDataBaseFileName': '$(OutDir)$(ProjectName).pdb', + 'Optimization': '3', # full (/Ox) + 'WholeProgramOptimization': 'true', #/GL + # Changing the floating point model requires rebaseling gm images + #'FloatingPointModel': '2', # fast (/fp:fast) + 'FavorSizeOrSpeed': '1', # speed (/Ot) 'PreprocessorDefinitions': ['NDEBUG'], - 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD) + 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD) + 'ExceptionHandling': '0', + 'RuntimeTypeInfo': 'false', # /GR- + 'WarningLevel': '3', # level3 (/W3) }, 'VCLinkerTool': { - 'GenerateDebugInformation': 'false', + 'GenerateDebugInformation': 'true', # /DEBUG + 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG }, }, }, |