summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--breakpad/breakpad.gyp40
-rw-r--r--build/all.gyp1
-rw-r--r--build/temp_gyp/breakpad.gyp73
-rw-r--r--chrome/chrome.sln4
-rw-r--r--webkit/webkit.sln2
5 files changed, 77 insertions, 43 deletions
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
deleted file mode 100644
index b7f6f80..0000000
--- a/breakpad/breakpad.gyp
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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',
- 'msvs_guid': 'B55CA863-B374-4BAF-95AC-539E4FA4C90C',
- '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',
- ],
- },
- },
- ],
-}
diff --git a/build/all.gyp b/build/all.gyp
index 394814e..758a49f 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -50,6 +50,7 @@
['OS=="win"', {
'dependencies': [
'../sandbox/sandbox.gyp:*',
+ 'temp_gyp/breakpad.gyp:*',
],
}, {
'dependencies': [
diff --git a/build/temp_gyp/breakpad.gyp b/build/temp_gyp/breakpad.gyp
new file mode 100644
index 0000000..f032446
--- /dev/null
+++ b/build/temp_gyp/breakpad.gyp
@@ -0,0 +1,73 @@
+# 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': [
+ '../common.gypi',
+ ],
+ 'conditions': [
+ [ 'OS=="win"', {
+ 'targets': [
+ {
+ 'target_name': 'breakpad_handler',
+ 'type': 'static_library',
+ 'msvs_guid': 'B55CA863-B374-4BAF-95AC-539E4FA4C90C',
+ 'sources': [
+ '../../breakpad/src/client/windows/crash_generation/client_info.cc',
+ '../../breakpad/src/client/windows/crash_generation/client_info.h',
+ '../../breakpad/src/client/windows/crash_generation/crash_generation_client.cc',
+ '../../breakpad/src/client/windows/crash_generation/crash_generation_client.h',
+ '../../breakpad/src/client/windows/crash_generation/crash_generation_server.cc',
+ '../../breakpad/src/client/windows/crash_generation/crash_generation_server.h',
+ '../../breakpad/src/client/windows/handler/exception_handler.cc',
+ '../../breakpad/src/client/windows/handler/exception_handler.h',
+ '../../breakpad/src/common/windows/guid_string.cc',
+ '../../breakpad/src/common/windows/guid_string.h',
+ '../../breakpad/src/google_breakpad/common/minidump_format.h',
+ '../../breakpad/src/client/windows/crash_generation/minidump_generator.cc',
+ '../../breakpad/src/client/windows/crash_generation/minidump_generator.h',
+ '../../breakpad/src/common/windows/string_utils-inl.h',
+ ],
+ 'include_dirs': [
+ '../../breakpad/src',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '-lurlmon.lib',
+ ],
+ },
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '../../breakpad/src',
+ ],
+ },
+ },
+ {
+ 'target_name': 'breakpad_sender',
+ 'type': 'static_library',
+ 'msvs_guid': '9946A048-043B-4F8F-9E07-9297B204714C',
+ 'sources': [
+ '../../breakpad/src/client/windows/sender/crash_report_sender.cc',
+ '../../breakpad/src/common/windows/http_upload.cc',
+ '../../breakpad/src/client/windows/sender/crash_report_sender.h',
+ '../../breakpad/src/common/windows/http_upload.h',
+ ],
+ 'include_dirs': [
+ '../../breakpad/src',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '-lurlmon.lib',
+ ],
+ },
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '../../breakpad/src',
+ ],
+ },
+ },
+ ],
+ }],
+ ],
+}
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 933e207..aa43979 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -113,9 +113,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image_diff", "tools\test\im
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Breakpad", "Breakpad", "{873D095E-150E-4262-8C41-2D8ED02F0F57}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "breakpad_handler", "..\breakpad\breakpad_handler.vcproj", "{B55CA863-B374-4BAF-95AC-539E4FA4C90C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "breakpad_handler", "..\build\temp_gyp\breakpad_handler.vcproj", "{B55CA863-B374-4BAF-95AC-539E4FA4C90C}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "breakpad_sender", "..\breakpad\breakpad_sender.vcproj", "{9946A048-043B-4F8F-9E07-9297B204714C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "breakpad_sender", "..\build\temp_gyp\breakpad_sender.vcproj", "{9946A048-043B-4F8F-9E07-9297B204714C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml", "..\third_party\libxml\libxml.vcproj", "{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}"
EndProject
diff --git a/webkit/webkit.sln b/webkit/webkit.sln
index b51949e..f090934 100644
--- a/webkit/webkit.sln
+++ b/webkit/webkit.sln
@@ -154,7 +154,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\third_party\zlib
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "..\third_party\libjpeg\libjpeg.vcproj", "{238CE175-76CE-4A25-A676-69D115885601}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "breakpad_handler", "..\breakpad\breakpad_handler.vcproj", "{B55CA863-B374-4BAF-95AC-539E4FA4C90C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "breakpad_handler", "..\build\temp_gyp\breakpad_handler.vcproj", "{B55CA863-B374-4BAF-95AC-539E4FA4C90C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modp_b64", "..\third_party\modp_b64\modp_b64.vcproj", "{7100F41F-868D-4E99-80A2-AF8E6574749D}"
EndProject
generated by cgit v1.1 at 2025-01-17 23:03:08 +0000