diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 17:38:45 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 17:38:45 +0000 |
| commit | 01a1952a4795b1eacfb10cdeffc41c95c26a044c (patch) | |
| tree | 9f3ebfb941b2aa0fd527baa736c95b0e0aa4795b | |
| parent | e444863cc211ee330361cbf41616005a4ff91a09 (diff) | |
| download | chromium_src-01a1952a4795b1eacfb10cdeffc41c95c26a044c.zip chromium_src-01a1952a4795b1eacfb10cdeffc41c95c26a044c.tar.gz chromium_src-01a1952a4795b1eacfb10cdeffc41c95c26a044c.tar.bz2 | |
Capture more necessary settings while trying to land conversion
of the last targets to gyp:
* 'unit_tests' depends on 'chrome_dll_version'.
* Various VCCLCompilerTool and VCLinkerTool settings for mini_installer.exe.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/125136
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18399 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome.gyp | 1 | ||||
| -rw-r--r-- | chrome/installer/installer.gyp | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 1cf14f5..4cd57bd 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3498,6 +3498,7 @@ '_SCL_SECURE_NO_DEPRECATE', ], 'dependencies': [ + 'chrome_dll_version', 'installer/installer.gyp:installer_util_strings', '../views/views.gyp:views', ], diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp index 170a054..cb5cf95 100644 --- a/chrome/installer/installer.gyp +++ b/chrome/installer/installer.gyp @@ -333,7 +333,15 @@ 'mini_installer/pe_resource.h', ], 'msvs_settings': { + 'VCCLCompilerTool': { + 'EnableIntrinicFunctions': 'true', + 'BasicRuntimeChekcs': '0', + 'BufferSecurityCheck': 'false', + }, 'VCLinkerTool': { + 'EntryPointSymbol': 'MainEntryPoint', + 'IgnoreAllDefaultLibraries': 'true', + 'OptimizeForWindows98': '1', 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS }, }, |