| OLD | NEW |
| 1 # conditions used in both common.gypi and skia.gyp in chromium | 1 # conditions used in both common.gypi and skia.gyp in chromium |
| 2 # | 2 # |
| 3 { | 3 { |
| 4 'defines': [ | 4 'defines': [ |
| 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', | 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', |
| 6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR', | 6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR', |
| 7 ], | 7 ], |
| 8 'conditions' : [ | 8 'conditions' : [ |
| 9 ['skia_gpu == 1', | 9 ['skia_gpu == 1', |
| 10 { | 10 { |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 { | 21 { |
| 22 'defines': [ | 22 'defines': [ |
| 23 'SK_BUILD_FOR_WIN32', | 23 'SK_BUILD_FOR_WIN32', |
| 24 'SK_IGNORE_STDINT_DOT_H', | 24 'SK_IGNORE_STDINT_DOT_H', |
| 25 '_CRT_SECURE_NO_WARNINGS', | 25 '_CRT_SECURE_NO_WARNINGS', |
| 26 'GR_GL_FUNCTION_TYPE=__stdcall', | 26 'GR_GL_FUNCTION_TYPE=__stdcall', |
| 27 ], | 27 ], |
| 28 'msvs_cygwin_shell': 0, | 28 'msvs_cygwin_shell': 0, |
| 29 'msvs_settings': { | 29 'msvs_settings': { |
| 30 'VCCLCompilerTool': { | 30 'VCCLCompilerTool': { |
| 31 'WarningLevel': '1', | 31 'WarningLevel': '3', |
| 32 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', |
| 32 'DebugInformationFormat': '3', | 33 'DebugInformationFormat': '3', |
| 33 'AdditionalOptions': [ '/MP' ], | 34 'ExceptionHandling': '0', |
| 35 'AdditionalOptions': [ '/MP', ], |
| 34 }, | 36 }, |
| 35 'VCLinkerTool': { | 37 'VCLinkerTool': { |
| 36 'AdditionalDependencies': [ | 38 'AdditionalDependencies': [ |
| 37 'OpenGL32.lib', | 39 'OpenGL32.lib', |
| 38 'usp10.lib', | 40 'usp10.lib', |
| 39 ], | 41 ], |
| 40 }, | 42 }, |
| 41 }, | 43 }, |
| 42 'configurations': { | 44 'configurations': { |
| 43 'Debug': { | 45 'Debug': { |
| 44 'msvs_settings': { | 46 'msvs_settings': { |
| 45 'VCCLCompilerTool': { | 47 'VCCLCompilerTool': { |
| 46 'DebugInformationFormat': '4', # editAndContiue (/ZI) | 48 'DebugInformationFormat': '4', # editAndContiue (/ZI) |
| 47 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', | |
| 48 'Optimization': '0', # optimizeDisabled (/Od) | 49 'Optimization': '0', # optimizeDisabled (/Od) |
| 49 'PreprocessorDefinitions': ['_DEBUG'], | 50 'PreprocessorDefinitions': ['_DEBUG'], |
| 50 'RuntimeLibrary': '3', # rtMultiThreadedDebugDLL (/MDd) | 51 'RuntimeLibrary': '3', # rtMultiThreadedDebugDLL (/MDd) |
| 51 'ExceptionHandling': '0', | |
| 52 'RuntimeTypeInfo': 'false', # /GR- | 52 'RuntimeTypeInfo': 'false', # /GR- |
| 53 'WarningLevel': '3', # level3 (/W3) | |
| 54 }, | 53 }, |
| 55 'VCLinkerTool': { | 54 'VCLinkerTool': { |
| 56 'GenerateDebugInformation': 'true', # /DEBUG | 55 'GenerateDebugInformation': 'true', # /DEBUG |
| 57 'LinkIncremental': '2', # /INCREMENTAL | 56 'LinkIncremental': '2', # /INCREMENTAL |
| 58 }, | 57 }, |
| 59 }, | 58 }, |
| 60 }, | 59 }, |
| 61 'Release': { | 60 'Release': { |
| 62 'msvs_settings': { | 61 'msvs_settings': { |
| 63 'VCCLCompilerTool': { | 62 'VCCLCompilerTool': { |
| 64 'DebugInformationFormat': '3', # programDatabase (/Zi) | 63 'DebugInformationFormat': '3', # programDatabase (/Zi) |
| 65 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', | |
| 66 'Optimization': '3', # full (/Ox) | 64 'Optimization': '3', # full (/Ox) |
| 67 'WholeProgramOptimization': 'true', #/GL | 65 'WholeProgramOptimization': 'true', #/GL |
| 68 # Changing the floating point model requires rebaseling gm images | 66 # Changing the floating point model requires rebaseling gm images |
| 69 #'FloatingPointModel': '2', # fast (/fp:fast) | 67 #'FloatingPointModel': '2', # fast (/fp:fast) |
| 70 'FavorSizeOrSpeed': '1', # speed (/Ot) | 68 'FavorSizeOrSpeed': '1', # speed (/Ot) |
| 71 'PreprocessorDefinitions': ['NDEBUG'], | 69 'PreprocessorDefinitions': ['NDEBUG'], |
| 72 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD) | 70 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD) |
| 73 'ExceptionHandling': '0', | |
| 74 'EnableEnhancedInstructionSet': '2',# /arch:SSE2 | 71 'EnableEnhancedInstructionSet': '2',# /arch:SSE2 |
| 75 'RuntimeTypeInfo': 'false', # /GR- | 72 'RuntimeTypeInfo': 'false', # /GR- |
| 76 'WarningLevel': '3', # level3 (/W3) | |
| 77 }, | 73 }, |
| 78 'VCLinkerTool': { | 74 'VCLinkerTool': { |
| 79 'GenerateDebugInformation': 'true', # /DEBUG | 75 'GenerateDebugInformation': 'true', # /DEBUG |
| 80 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration
/LTCG | 76 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration
/LTCG |
| 81 }, | 77 }, |
| 82 'VCLibrarianTool': { | 78 'VCLibrarianTool': { |
| 83 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration
/LTCG | 79 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration
/LTCG |
| 84 }, | 80 }, |
| 85 }, | 81 }, |
| 86 }, | 82 }, |
| (...skipping 21 matching lines...) Expand all Loading... |
| 108 'msvs_settings': { | 104 'msvs_settings': { |
| 109 'VCCLCompilerTool': { | 105 'VCCLCompilerTool': { |
| 110 'WarnAsError': 'false', | 106 'WarnAsError': 'false', |
| 111 }, | 107 }, |
| 112 }, | 108 }, |
| 113 },{ # not angle | 109 },{ # not angle |
| 114 'msvs_configuration_platform': 'Win32', | 110 'msvs_configuration_platform': 'Win32', |
| 115 'msvs_settings': { | 111 'msvs_settings': { |
| 116 'VCCLCompilerTool': { | 112 'VCCLCompilerTool': { |
| 117 'WarnAsError': 'true', | 113 'WarnAsError': 'true', |
| 114 'AdditionalOptions': [ |
| 115 '/we4189', # initialized but unused var warning |
| 116 ], |
| 118 }, | 117 }, |
| 119 }, | 118 }, |
| 120 }], | 119 }], |
| 121 ], | 120 ], |
| 122 }], | 121 }], |
| 123 ], | 122 ], |
| 124 }, | 123 }, |
| 125 ], | 124 ], |
| 126 | 125 |
| 127 ['skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', | 126 ['skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 'xcode_settings': { | 382 'xcode_settings': { |
| 384 'SYMROOT': '<(DEPTH)/xcodebuild', | 383 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 385 }, | 384 }, |
| 386 } | 385 } |
| 387 | 386 |
| 388 # Local Variables: | 387 # Local Variables: |
| 389 # tab-width:2 | 388 # tab-width:2 |
| 390 # indent-tabs-mode:nil | 389 # indent-tabs-mode:nil |
| 391 # End: | 390 # End: |
| 392 # vim: set expandtab tabstop=2 shiftwidth=2: | 391 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |