Fixes to gyp files to get test_shell building on windows from a gyp project (doesn't run correctly yet).
Switched all uses of windows system libraries that assumed they were in the include path to use -l (which will be supported on windows in a separate change). Review URL: http://codereview.chromium.org/27362 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10781 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
39
breakpad/breakpad.gyp
Normal file
39
breakpad/breakpad.gyp
Normal file
@ -0,0 +1,39 @@
|
||||
# Copyright (c) 2009 The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
{
|
||||
'includes': [
|
||||
'../build/common.gypi',
|
||||
],
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'breakpad_handler',
|
||||
'type': 'static_library',
|
||||
'sources': [
|
||||
'src/client/windows/crash_generation/client_info.cc',
|
||||
'src/client/windows/crash_generation/client_info.h',
|
||||
'src/client/windows/crash_generation/crash_generation_client.cc',
|
||||
'src/client/windows/crash_generation/crash_generation_client.h',
|
||||
'src/client/windows/crash_generation/crash_generation_server.cc',
|
||||
'src/client/windows/crash_generation/crash_generation_server.h',
|
||||
'src/client/windows/handler/exception_handler.cc',
|
||||
'src/client/windows/handler/exception_handler.h',
|
||||
'src/common/windows/guid_string.cc',
|
||||
'src/common/windows/guid_string.h',
|
||||
'src/google_breakpad/common/minidump_format.h',
|
||||
'src/client/windows/crash_generation/minidump_generator.cc',
|
||||
'src/client/windows/crash_generation/minidump_generator.h',
|
||||
'src/common/windows/string_utils-inl.h',
|
||||
],
|
||||
'include_dirs': [
|
||||
'src',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'src',
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
}
|
@ -331,8 +331,8 @@
|
||||
# dtoa-specific warnings by modifying dtoa as was done in Chromium
|
||||
# r9255. Refer to that revision for details.
|
||||
'msvs_disabled_warnings': [4355, 4800, 4018, 4244],
|
||||
'all_dependent_settings': {
|
||||
'msvs_system_libraries': [ 'winmm.lib' ],
|
||||
'link_settings': {
|
||||
'libraries': [ '-lwinmm.lib' ],
|
||||
},
|
||||
}],
|
||||
],
|
||||
|
15
net/net.gyp
15
net/net.gyp
@ -353,21 +353,6 @@
|
||||
},
|
||||
},
|
||||
],
|
||||
[ 'OS == "win"', {
|
||||
# This used to live in build_convert_tld_data.rules
|
||||
#'msvs_tool_files': ['build/convert_tld_data.rules'],
|
||||
'rules': [
|
||||
{
|
||||
'rule_name': 'tld_convert',
|
||||
'extension': 'dat',
|
||||
'inputs': [ '<(RULE_INPUT_PATH)' ],
|
||||
'outputs':
|
||||
['<(INTERMEDIATE_DIR)/../<(RULE_INPUT_ROOT)_clean.dat'],
|
||||
'action':
|
||||
['<(PRODUCT_DIR)/tld_cleanup', '<@(_inputs)', '<@(_outputs)'],
|
||||
},
|
||||
],
|
||||
},],
|
||||
],
|
||||
},
|
||||
{
|
||||
|
@ -39,9 +39,11 @@
|
||||
'web_activex_site.cc',
|
||||
'web_activex_site.h',
|
||||
],
|
||||
'libraries': [
|
||||
'urlmon.lib',
|
||||
],
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
'-lurlmon.lib',
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
}
|
||||
|
@ -14,6 +14,7 @@
|
||||
'target_name': 'activex_shim_dll',
|
||||
'type': 'shared_library',
|
||||
'dependencies': [
|
||||
'../../base/base.gyp:base',
|
||||
'../../third_party/npapi/npapi.gyp:npapi',
|
||||
'../activex_shim/activex_shim.gyp:activex_shim',
|
||||
],
|
||||
@ -23,6 +24,11 @@
|
||||
'activex_shim_dll.rc',
|
||||
'resource.h',
|
||||
],
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
'-lurlmon.lib',
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
}
|
||||
|
47
webkit/default_plugin/default_plugin.gyp
Normal file
47
webkit/default_plugin/default_plugin.gyp
Normal file
@ -0,0 +1,47 @@
|
||||
# Copyright (c) 2009 The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
{
|
||||
'includes': [
|
||||
'../../build/common.gypi',
|
||||
],
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'default_plugin',
|
||||
'type': 'static_library',
|
||||
'dependencies': [
|
||||
'../../third_party/libxml/libxml.gyp:libxml',
|
||||
'../../third_party/icu38/icu38.gyp:icui18n',
|
||||
'../../third_party/icu38/icu38.gyp:icuuc',
|
||||
'../../third_party/npapi/npapi.gyp:npapi',
|
||||
'../../net/net.gyp:net_resources',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../..',
|
||||
# TODO(bradnelson): this should fall out of the dependencies.
|
||||
'<(SHARED_INTERMEDIATE_DIR)/webkit',
|
||||
],
|
||||
'sources': [
|
||||
'activex_installer.cc',
|
||||
'activex_installer.h',
|
||||
'default_plugin.cc',
|
||||
'default_plugin_resources.h',
|
||||
'default_plugin_shared.h',
|
||||
'install_dialog.cc',
|
||||
'install_dialog.h',
|
||||
'plugin_database_handler.cc',
|
||||
'plugin_database_handler.h',
|
||||
'plugin_impl_win.cc',
|
||||
'plugin_impl_win.h',
|
||||
'plugin_install_job_monitor.cc',
|
||||
'plugin_install_job_monitor.h',
|
||||
'plugin_main.cc',
|
||||
'plugin_main.h',
|
||||
],
|
||||
'link_settings': {
|
||||
'libraries': ['-lUrlmon.lib'],
|
||||
},
|
||||
},
|
||||
],
|
||||
}
|
@ -89,10 +89,15 @@
|
||||
]
|
||||
}],
|
||||
['OS=="win"', {
|
||||
'include_dirs': [
|
||||
'../../../breakpad/src',
|
||||
],
|
||||
'msvs_disabled_warnings': [ 4800 ],
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
'-lcomctl32.lib',
|
||||
],
|
||||
},
|
||||
'dependencies': [
|
||||
'../../../breakpad/breakpad.gyp:breakpad_handler',
|
||||
],
|
||||
}, { # OS!=win
|
||||
'sources/': [
|
||||
['exclude', '_win\\.cc$']
|
||||
|
@ -110,6 +110,12 @@
|
||||
# Match Safari and Mozilla on Windows.
|
||||
'WEBCORE_NAVIGATOR_PLATFORM="Win32"',
|
||||
],
|
||||
'webcore_include_dirs': [
|
||||
'../third_party/WebKit/WebCore/page/win',
|
||||
'../third_party/WebKit/WebCore/platform/graphics/win',
|
||||
'../third_party/WebKit/WebCore/platform/text/win',
|
||||
'../third_party/WebKit/WebCore/platform/win',
|
||||
],
|
||||
}, { # else: OS!="win"
|
||||
'feature_defines': [
|
||||
'ENABLE_VIDEO=0'
|
||||
@ -3999,7 +4005,15 @@
|
||||
},
|
||||
}],
|
||||
['OS=="win"', {
|
||||
'sources/': [['exclude', 'Posix\\.cpp$']],
|
||||
'sources/': [
|
||||
['exclude', 'Posix\\.cpp$'],
|
||||
['include', '/opentype/'],
|
||||
['include', '/TransparencyWin\\.cpp$'],
|
||||
['include', '/SkiaFontWin\\.cpp$'],
|
||||
],
|
||||
'sources!': [
|
||||
'../third_party/WebKit/WebCore/platform/network/ResourceHandle.cpp',
|
||||
],
|
||||
'defines': [
|
||||
'__PRETTY_FUNCTION__=__FUNCTION__',
|
||||
'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2',
|
||||
@ -4343,6 +4357,13 @@
|
||||
],
|
||||
}, { # else: OS=="win"
|
||||
'sources/': [['exclude', '_posix\\.cc$']],
|
||||
'dependencies': [
|
||||
'activex_shim/activex_shim.gyp:activex_shim',
|
||||
'default_plugin/default_plugin.gyp:default_plugin',
|
||||
],
|
||||
'sources!': [
|
||||
'glue/plugins/plugin_stubs.cc',
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
|
Reference in New Issue
Block a user