| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'version_py': '../../chrome/tools/build/version.py', | 3 'version_py': '../../chrome/tools/build/version.py', |
| 4 'version_path': '../../chrome/VERSION', | 4 'version_path': '../../chrome/VERSION', |
| 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', | 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', |
| 6 # 'branding_dir' is set in the 'conditions' section at the bottom. | 6 # 'branding_dir' is set in the 'conditions' section at the bottom. |
| 7 'msvs_use_common_release': 0, | 7 'msvs_use_common_release': 0, |
| 8 'msvs_use_common_linker_extras': 0, | 8 'msvs_use_common_linker_extras': 0, |
| 9 }, | 9 }, |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 'mini_installer/mini_installer.rc', | 35 'mini_installer/mini_installer.rc', |
| 36 'mini_installer/mini_installer_exe_version.rc.version', | 36 'mini_installer/mini_installer_exe_version.rc.version', |
| 37 'mini_installer/mini_installer_resource.h', | 37 'mini_installer/mini_installer_resource.h', |
| 38 'mini_installer/pe_resource.cc', | 38 'mini_installer/pe_resource.cc', |
| 39 'mini_installer/pe_resource.h', | 39 'mini_installer/pe_resource.h', |
| 40 ], | 40 ], |
| 41 'msvs_settings': { | 41 'msvs_settings': { |
| 42 'VCCLCompilerTool': { | 42 'VCCLCompilerTool': { |
| 43 'EnableIntrinsicFunctions': 'true', | 43 'EnableIntrinsicFunctions': 'true', |
| 44 'BufferSecurityCheck': 'false', | 44 'BufferSecurityCheck': 'false', |
| 45 'BasicRuntimeChecks': '0', |
| 45 }, | 46 }, |
| 46 'VCLinkerTool': { | 47 'VCLinkerTool': { |
| 47 'AdditionalOptions': | |
| 48 '/safeseh:no /dynamicbase:no /ignore:4199 /ignore:4221 /nxcompat
', | |
| 49 'RandomizedBaseAddress': '1', | 48 'RandomizedBaseAddress': '1', |
| 50 'DataExecutionPrevention': '0', | 49 'DataExecutionPrevention': '0', |
| 51 'AdditionalLibraryDirectories': | 50 'AdditionalLibraryDirectories': [ |
| 52 ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib;<(PRODU
CT_DIR)/lib'], | 51 '<(DEPTH)/third_party/platformsdk_win7/files/Lib', |
| 53 # TODO(bradnelson): change when vsprops are all in gyp. | 52 '<(PRODUCT_DIR)/lib' |
| 53 ], |
| 54 'DelayLoadDLLs': [], | 54 'DelayLoadDLLs': [], |
| 55 'EntryPointSymbol': 'MainEntryPoint', | 55 'EntryPointSymbol': 'MainEntryPoint', |
| 56 'GenerateMapFile': 'true', | 56 'GenerateMapFile': 'true', |
| 57 'IgnoreAllDefaultLibraries': 'true', | 57 'IgnoreAllDefaultLibraries': 'true', |
| 58 'OptimizeForWindows98': '1', | 58 'OptimizeForWindows98': '1', |
| 59 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 59 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
| 60 'AdditionalDependencies': [ |
| 61 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"', |
| 62 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"', |
| 63 'shlwapi.lib', |
| 64 ], |
| 65 }, |
| 66 'VCManifestTool': { |
| 67 'AdditionalManifestFiles': [ |
| 68 '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest', |
| 69 ], |
| 60 }, | 70 }, |
| 61 }, | 71 }, |
| 62 'configurations': { | 72 'configurations': { |
| 63 'Debug_Base': { | 73 'Debug_Base': { |
| 64 'msvs_settings': { | 74 'msvs_settings': { |
| 65 'VCCLCompilerTool': { | 75 'VCCLCompilerTool': { |
| 66 'BasicRuntimeChecks': '0', | 76 'BasicRuntimeChecks': '0', |
| 67 }, | 77 }, |
| 68 # TODO(bradnelson): Add these back to common configuration | |
| 69 # when vsprops goes away. | |
| 70 'VCLinkerTool': { | 78 'VCLinkerTool': { |
| 71 'AdditionalDependencies': [ | 79 'AdditionalOptions': [ |
| 72 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"', | 80 '/safeseh:no', |
| 73 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"', | 81 '/dynamicbase:no', |
| 74 'shlwapi.lib', | 82 '/ignore:4199', |
| 83 '/ignore:4221', |
| 84 '/nxcompat', |
| 75 ], | 85 ], |
| 76 }, | 86 }, |
| 77 'VCManifestTool': { | |
| 78 'AdditionalManifestFiles': '$(ProjectDir)\\mini_installer\\min
i_installer.exe.manifest', | |
| 79 }, | |
| 80 }, | 87 }, |
| 81 }, | 88 }, |
| 82 'Release': { | 89 'Release_Base': { |
| 83 'msvs_props': ['mini_installer/mini_installer_release.vsprops'], | 90 'includes': ['../../build/internal/release_defaults.gypi'], |
| 84 'msvs_settings': { | 91 'msvs_settings': { |
| 85 'VCCLCompilerTool': { | 92 'VCCLCompilerTool': { |
| 93 'EnableIntrinsicFunctions': 'true', |
| 86 'BasicRuntimeChecks': '0', | 94 'BasicRuntimeChecks': '0', |
| 95 'BufferSecurityCheck': 'false', |
| 96 }, |
| 97 'VCLinkerTool': { |
| 98 'AdditionalOptions': [ |
| 99 '/SAFESEH:NO', |
| 100 '/NXCOMPAT', |
| 101 '/DYNAMICBASE:NO', |
| 102 '/FIXED', |
| 103 ], |
| 87 }, | 104 }, |
| 88 }, | 105 }, |
| 89 }, | 106 }, |
| 90 }, | 107 }, |
| 91 'rules': [ | 108 'rules': [ |
| 92 { | 109 { |
| 93 'rule_name': 'mini_installer_version', | 110 'rule_name': 'mini_installer_version', |
| 94 'extension': 'version', | 111 'extension': 'version', |
| 95 'variables': { | 112 'variables': { |
| 96 'template_input_path': 'mini_installer/mini_installer_exe_versio
n.rc.version', | 113 'template_input_path': 'mini_installer/mini_installer_exe_versio
n.rc.version', |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 }, | 200 }, |
| 184 }], | 201 }], |
| 185 ], | 202 ], |
| 186 } | 203 } |
| 187 | 204 |
| 188 # Local Variables: | 205 # Local Variables: |
| 189 # tab-width:2 | 206 # tab-width:2 |
| 190 # indent-tabs-mode:nil | 207 # indent-tabs-mode:nil |
| 191 # End: | 208 # End: |
| 192 # vim: set expandtab tabstop=2 shiftwidth=2: | 209 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |