Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2889)

Unified Diff: chrome/installer/mini_installer.gyp

Issue 523027: Removing the last remaining vsprops files.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 10 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/release.vsprops ('k') | chrome/installer/mini_installer/mini_installer.vsprops » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/mini_installer.gyp
===================================================================
--- chrome/installer/mini_installer.gyp (revision 35447)
+++ chrome/installer/mini_installer.gyp (working copy)
@@ -42,22 +42,32 @@
'VCCLCompilerTool': {
'EnableIntrinsicFunctions': 'true',
'BufferSecurityCheck': 'false',
+ 'BasicRuntimeChecks': '0',
},
'VCLinkerTool': {
- 'AdditionalOptions':
- '/safeseh:no /dynamicbase:no /ignore:4199 /ignore:4221 /nxcompat',
'RandomizedBaseAddress': '1',
'DataExecutionPrevention': '0',
- 'AdditionalLibraryDirectories':
- ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib;<(PRODUCT_DIR)/lib'],
- # TODO(bradnelson): change when vsprops are all in gyp.
+ 'AdditionalLibraryDirectories': [
+ '<(DEPTH)/third_party/platformsdk_win7/files/Lib',
+ '<(PRODUCT_DIR)/lib'
+ ],
'DelayLoadDLLs': [],
'EntryPointSymbol': 'MainEntryPoint',
'GenerateMapFile': 'true',
'IgnoreAllDefaultLibraries': 'true',
'OptimizeForWindows98': '1',
'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
+ 'AdditionalDependencies': [
+ '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"',
+ '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"',
+ 'shlwapi.lib',
+ ],
},
+ 'VCManifestTool': {
+ 'AdditionalManifestFiles': [
+ '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest',
+ ],
+ },
},
'configurations': {
'Debug_Base': {
@@ -65,26 +75,33 @@
'VCCLCompilerTool': {
'BasicRuntimeChecks': '0',
},
- # TODO(bradnelson): Add these back to common configuration
- # when vsprops goes away.
'VCLinkerTool': {
- 'AdditionalDependencies': [
- '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"',
- '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"',
- 'shlwapi.lib',
+ 'AdditionalOptions': [
+ '/safeseh:no',
+ '/dynamicbase:no',
+ '/ignore:4199',
+ '/ignore:4221',
+ '/nxcompat',
],
},
- 'VCManifestTool': {
- 'AdditionalManifestFiles': '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest',
- },
},
},
- 'Release': {
- 'msvs_props': ['mini_installer/mini_installer_release.vsprops'],
+ 'Release_Base': {
+ 'includes': ['../../build/internal/release_defaults.gypi'],
'msvs_settings': {
'VCCLCompilerTool': {
+ 'EnableIntrinsicFunctions': 'true',
'BasicRuntimeChecks': '0',
+ 'BufferSecurityCheck': 'false',
},
+ 'VCLinkerTool': {
+ 'AdditionalOptions': [
+ '/SAFESEH:NO',
+ '/NXCOMPAT',
+ '/DYNAMICBASE:NO',
+ '/FIXED',
+ ],
+ },
},
},
},
« no previous file with comments | « build/release.vsprops ('k') | chrome/installer/mini_installer/mini_installer.vsprops » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698