aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoshimun@gmail.com <doshimun@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2008-03-11 22:28:48 +0000
committerdoshimun@gmail.com <doshimun@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2008-03-11 22:28:48 +0000
commit5066fcdb42bbcf150a5d2636a6b38548ebe19065 (patch)
treeea7089ec7eabfc6d670ef6582604041115a95548
parentThis changelist contains the changes to the configuration of Visual Studio so... (diff)
downloadbreakpad-5066fcdb42bbcf150a5d2636a6b38548ebe19065.tar.xz
TO BE REVIEWED.
Have sent an email for code review already but this check-in is urgent to fix potential build breaks. It contains the following changes: - Change project settings for exception_handler.vcproj so that it links in crash_generation.lib so that the applications using exception_handler.lib do not have to link to crash_generation.lib. Make these changes for all 4 build configurations. - Change the test app project settings to not link to crash_generation.lib and only link to exception_handler.lib; again for all four configurations. These changes help the applications that are currently linking to exception_handler.lib in that they don't have to link to one more lib to get out-of-process dump generation functionality. In fact, even if they do not use out-of-process dump generation functionality, after those changes, the apps will need to link with crash_generation.lib anyway in order to build correctly. This change will eliminate that need. git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@248 4c0a9323-5329-0410-9bdc-e9ce6186880e
-rw-r--r--src/client/windows/breakpad_client.sln3
-rw-r--r--src/client/windows/handler/exception_handler.vcproj8
-rw-r--r--src/client/windows/tests/crash_generation_app/crash_generation_app.vcproj8
3 files changed, 15 insertions, 4 deletions
diff --git a/src/client/windows/breakpad_client.sln b/src/client/windows/breakpad_client.sln
index 441e90d8..8c89b546 100644
--- a/src/client/windows/breakpad_client.sln
+++ b/src/client/windows/breakpad_client.sln
@@ -2,6 +2,9 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exception_handler", "handler\exception_handler.vcproj", "{B55CA863-B374-4BAF-95AC-539E4FA4C90C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {A820AF62-6239-4693-8430-4F516C1838F4} = {A820AF62-6239-4693-8430-4F516C1838F4}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crash_report_sender", "sender\crash_report_sender.vcproj", "{9946A048-043B-4F8F-9E07-9297B204714C}"
EndProject
diff --git a/src/client/windows/handler/exception_handler.vcproj b/src/client/windows/handler/exception_handler.vcproj
index 7e5998e4..01885c9d 100644
--- a/src/client/windows/handler/exception_handler.vcproj
+++ b/src/client/windows/handler/exception_handler.vcproj
@@ -61,6 +61,8 @@
/>
<Tool
Name="VCLibrarianTool"
+ AdditionalDependencies="crash_generation.lib"
+ AdditionalLibraryDirectories="..\$(ConfigurationName)"
/>
<Tool
Name="VCALinkTool"
@@ -122,6 +124,8 @@
/>
<Tool
Name="VCLibrarianTool"
+ AdditionalDependencies="crash_generation.lib"
+ AdditionalLibraryDirectories="..\$(ConfigurationName)"
/>
<Tool
Name="VCALinkTool"
@@ -185,6 +189,8 @@
/>
<Tool
Name="VCLibrarianTool"
+ AdditionalDependencies="crash_generation.lib"
+ AdditionalLibraryDirectories="..\$(ConfigurationName)"
/>
<Tool
Name="VCALinkTool"
@@ -246,6 +252,8 @@
/>
<Tool
Name="VCLibrarianTool"
+ AdditionalDependencies="crash_generation.lib"
+ AdditionalLibraryDirectories="..\$(ConfigurationName)"
/>
<Tool
Name="VCALinkTool"
diff --git a/src/client/windows/tests/crash_generation_app/crash_generation_app.vcproj b/src/client/windows/tests/crash_generation_app/crash_generation_app.vcproj
index 597f7e90..ad5b28a6 100644
--- a/src/client/windows/tests/crash_generation_app/crash_generation_app.vcproj
+++ b/src/client/windows/tests/crash_generation_app/crash_generation_app.vcproj
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="crash_generation.lib exception_handler.lib"
+ AdditionalDependencies="exception_handler.lib"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -139,7 +139,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="crash_generation.lib exception_handler.lib"
+ AdditionalDependencies="exception_handler.lib"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -220,7 +220,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="crash_generation.lib exception_handler.lib"
+ AdditionalDependencies="exception_handler.lib"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -297,7 +297,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="crash_generation.lib exception_handler.lib"
+ AdditionalDependencies="exception_handler.lib"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\$(ConfigurationName)"
GenerateDebugInformation="true"