Chromium Code Reviews| Index: chrome/chrome_exe.gypi |
| =================================================================== |
| --- chrome/chrome_exe.gypi (revision 100565) |
| +++ chrome/chrome_exe.gypi (working copy) |
| @@ -24,7 +24,7 @@ |
| 'app/hard_error_handler_win.cc', |
| 'app/hard_error_handler_win.h', |
| 'app/scoped_ole_initializer.h', |
| - '../content/app/sandbox_helper_win.cc', |
| + '../content/app/startup_helper_win.cc', |
| '../content/common/content_switches.cc', |
| ], |
| 'mac_bundle_resources': [ |
| @@ -516,22 +516,31 @@ |
| 'target_name': 'chrome_nacl_win64', |
| 'type': 'executable', |
| 'product_name': 'nacl64', |
| - 'variables': { |
| - 'chrome_exe_target': 1, |
| - }, |
| + 'sources': [ |
| + 'app/breakpad_win.cc', |
| + 'app/hard_error_handler_win.cc', |
| + 'nacl/nacl_exe_win_64.cc', |
| + '../content/app/startup_helper_win.cc', |
| + '../content/common/content_switches.cc', |
| + '../content/common/debug_flags.cc', # Needed for sandbox_policy.cc |
| + '../content/common/hi_res_timer_manager_win.cc', |
| + '../content/common/sandbox_policy.cc', |
| + '../content/common/sandbox_init_wrapper_win.cc', |
| + '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc', |
| + ], |
| 'dependencies': [ |
| - # On Windows make sure we've built Win64 version of chrome_dll, |
| - # which contains all of the library code with Chromium |
| - # functionality. |
| + 'app/policy/cloud_policy_codegen.gyp:policy_win64', |
| 'chrome_version_resources', |
| - 'chrome_dll_nacl_win64', |
| 'common_constants_win64', |
| 'installer_util_nacl_win64', |
| - 'app/policy/cloud_policy_codegen.gyp:policy_win64', |
| + 'nacl_win64', |
| '../breakpad/breakpad.gyp:breakpad_handler_win64', |
| '../breakpad/breakpad.gyp:breakpad_sender_win64', |
| + '../base/base.gyp:base_i18n_nacl_win64', |
| '../base/base.gyp:base_nacl_win64', |
| '../base/base.gyp:base_static_win64', |
| + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64', |
| + '../ipc/ipc.gyp:ipc_win64', |
| '../sandbox/sandbox.gyp:sandbox_win64', |
| ], |
| 'defines': [ |
| @@ -540,13 +549,11 @@ |
| 'include_dirs': [ |
| '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| ], |
| - 'sources': [ |
| - '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc', |
| - ], |
| 'msvs_settings': { |
| 'VCLinkerTool': { |
| 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', |
| 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', |
| + 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
|
noelallen1
2011/09/12 18:52:39
nit: Isn't this the default? Not sure you really
jam
2011/09/12 19:53:02
the default is a SUBSYSTEM:CONSOLE
|
| }, |
| }, |
| 'configurations': { |