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

Unified Diff: chrome/chrome_exe.gypi

Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove nacl_win64 and dummy hacks Created 9 years, 3 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
Index: chrome/chrome_exe.gypi
===================================================================
--- chrome/chrome_exe.gypi (revision 100565)
+++ chrome/chrome_exe.gypi (working copy)
@@ -516,14 +516,20 @@
'target_name': 'chrome_nacl_win64',
'type': 'executable',
'product_name': 'nacl64',
- 'variables': {
- 'chrome_exe_target': 1,
- },
+ 'sources': [
+ 'app/breakpad_win.cc',
+ 'app/client_util.cc',
+ 'app/hard_error_handler_win.cc',
+ 'app/scoped_ole_initializer.h',
+ 'nacl/nacl_exe_win_64.cc',
+ '../content/app/sandbox_helper_win.cc',
+ '../content/common/content_switches.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.
- 'chrome_version_resources',
'chrome_dll_nacl_win64',
'common_constants_win64',
'installer_util_nacl_win64',
@@ -540,13 +546,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',
Brad Chen (chromium) 2011/09/11 17:35:37 What does this mean? I'm not fluent in MSVS settin
jam 2011/09/11 22:51:37 This just tells Visual Studio that it's generating
},
},
'configurations': {

Powered by Google App Engine
This is Rietveld 408576698