Skip to content
Permalink
Browse files
Fix compiler warnings when building MiniBrowser
Also cleaned up the .vcproj a bit.

Fixes <http://webkit.org/b/42743>.

Reviewed by Darin Adler.

* MiniBrowser/MiniBrowser.vcproj: Removed all settings that are
already defined in .vsprops files. This also fixes a warning about
/EDITANDCONTINUE being incompatible with /SAFESEH.

* MiniBrowser/win/MiniBrowser.rc: Replaced afxres.h with winresrc.h so
that we stop getting warnings about ID_FILE_OPEN and ID_FILE_CLOSE
being redefined. (I think this will also get us closer to building
with VC++ Express.)

Canonical link: https://commits.webkit.org/54660@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63823 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
aroben committed Jul 21, 2010
1 parent 46cf25c commit 34238b4e340fb010debe691cb79301ae59c18e74
Showing with 22 additions and 37 deletions.
  1. +19 −0 WebKitTools/ChangeLog
  2. +2 −27 WebKitTools/MiniBrowser/MiniBrowser.vcproj
  3. +1 −10 WebKitTools/MiniBrowser/win/MiniBrowser.rc
@@ -1,3 +1,22 @@
2010-07-21 Adam Roben <aroben@apple.com>

Fix compiler warnings when building MiniBrowser

Also cleaned up the .vcproj a bit.

Fixes <http://webkit.org/b/42743>.

Reviewed by Darin Adler.

* MiniBrowser/MiniBrowser.vcproj: Removed all settings that are
already defined in .vsprops files. This also fixes a warning about
/EDITANDCONTINUE being incompatible with /SAFESEH.

* MiniBrowser/win/MiniBrowser.rc: Replaced afxres.h with winresrc.h so
that we stop getting warnings about ID_FILE_OPEN and ID_FILE_CLOSE
being redefined. (I think this will also get us closer to building
with VC++ Express.)

2010-07-20 Sam Weinig <sam@webkit.org>

Reviewed by Jon Honeycutt.
@@ -42,35 +42,22 @@
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
WarnAsError="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="&quot;$(IntDir)\include&quot;;..\..\Internal\Safari\win\WTL80\include"
AdditionalIncludeDirectories=""
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="shlwapi.lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -129,33 +116,21 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="3"
WarnAsError="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="&quot;$(IntDir)\include&quot;;..\Safari\win\WTL80\include"
AdditionalIncludeDirectories=""
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="shlwapi.lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -1,16 +1,7 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
#include "winresrc.h"

/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources

0 comments on commit 34238b4

Please sign in to comment.