summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/common.gypi2
-rw-r--r--chrome/installer/installer.gyp3
2 files changed, 1 insertions, 4 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 7d40440..35cb3b9 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -484,7 +484,7 @@
},
'VCLinkerTool': {
'AdditionalOptions':
- '/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat',
+ '/safeseh:NO /dynamicbase:NO /ignore:4199 /ignore:4221 /nxcompat',
'AdditionalDependencies': [
'wininet.lib',
'version.lib',
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index cc20252..67e84c1 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -310,7 +310,6 @@
'target_name': 'mini_installer',
'type': 'executable',
'msvs_guid': '24A5AC7C-280B-4899-9153-6BA570A081E7',
- 'msvs_existing_vcproj': 'mini_installer/mini_installer.vcproj',
'dependencies': [
'../chrome.gyp:chrome',
'../chrome.gyp:chrome_dll',
@@ -348,8 +347,6 @@
],
'AdditionalLibraryDirectories':
['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib;<(PRODUCT_DIR)/lib'],
- 'AdditionalOptions':
- '/safeseh:NO /dynamicbase:no /nxcompat /fixed',
'DelayLoadDLLs=': [],
'EntryPointSymbol': 'MainEntryPoint',
'GenerateMapFile': 'true',