Commit 88bc8bec authored by mrowe@apple.com's avatar mrowe@apple.com

Clean up after r40240.

Rubber-stamped by Sam Weinig.

* WebKit.xcodeproj/project.pbxproj: Reinstate WebKitPluginHost.defs.

* Configurations/Base.xcconfig: Don't dead code strip in debug builds for now as it leads to link errors.
* Plugins/Hosted/HostedNetscapePluginStream.mm: Revert change that is no longer needed now that WebKitPluginHost.defs
is back in the build.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@40253 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f05da8ee
2009-01-26 Mark Rowe <mrowe@apple.com>
Rubber-stamped by Sam Weinig.
Clean up after r40240.
* WebKit.xcodeproj/project.pbxproj: Reinstate WebKitPluginHost.defs.
2009-01-25 Darin Adler <darin@apple.com>
Try to fix full build on Mac Leopard.
......
......@@ -40,6 +40,7 @@
1AAF5CEE0EDDE1FE008D883D /* NetscapePluginInstanceProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5CE80EDDE1FE008D883D /* NetscapePluginInstanceProxy.h */; };
1AAF5CEF0EDDE1FE008D883D /* NetscapePluginInstanceProxy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5CE90EDDE1FE008D883D /* NetscapePluginInstanceProxy.mm */; };
1AAF5CF10EDDE586008D883D /* WebKitPluginHost.defs in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF588D0EDCCEA3008D883D /* WebKitPluginHost.defs */; };
1AAF5D000EDDE604008D883D /* WebKitPluginClient.defs in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF588C0EDCCEA3008D883D /* WebKitPluginClient.defs */; settings = {ATTRIBUTES = (Server, ); }; };
1AAF5D090EDDE71D008D883D /* WebKitPluginHostTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5D080EDDE71D008D883D /* WebKitPluginHostTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AAF5D0F0EDDE7A7008D883D /* WebKitPluginAgent.defs in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF588A0EDCCEA3008D883D /* WebKitPluginAgent.defs */; };
1AAF5FBF0EDE3A92008D883D /* WebHostedNetscapePluginView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5FBD0EDE3A92008D883D /* WebHostedNetscapePluginView.h */; };
......@@ -1645,6 +1646,7 @@
939810C30824BF01008DF038 /* WebKitLogging.m in Sources */,
939810C40824BF01008DF038 /* WebKitNSStringExtras.m in Sources */,
1AAF5D0F0EDDE7A7008D883D /* WebKitPluginAgent.defs in Sources */,
1AAF5D000EDDE604008D883D /* WebKitPluginClient.defs in Sources */,
BCDFA9130C10B93E00D3A10C /* WebKitPluginContainerView.mm in Sources */,
1AAF5CF10EDDE586008D883D /* WebKitPluginHost.defs in Sources */,
939810C50824BF01008DF038 /* WebKitStatistics.m in Sources */,
......@@ -1811,7 +1813,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 1C904FD40BA9DD0F0081E9D0 /* DebugRelease.xcconfig */;
buildSettings = {
DEAD_CODE_STRIPPING = "$(DEAD_CODE_STRIPPING_debug)";
DEBUG_DEFINES = "$(DEBUG_DEFINES_debug)";
GCC_OPTIMIZATION_LEVEL = "$(GCC_OPTIMIZATION_LEVEL_debug)";
STRIP_INSTALLED_PRODUCT = "$(STRIP_INSTALLED_PRODUCT_debug)";
......
2009-01-26 Mark Rowe <mrowe@apple.com>
Rubber-stamped by Sam Weinig.
Clean up after r40240.
* Configurations/Base.xcconfig: Don't dead code strip in debug builds for now as it leads to link errors.
* Plugins/Hosted/HostedNetscapePluginStream.mm: Revert change that is no longer needed now that WebKitPluginHost.defs
is back in the build.
2009-01-25 Darin Adler <darin@apple.com>
* Plugins/Hosted/HostedNetscapePluginStream.mm: Added a missing extern "C".
......
......@@ -39,9 +39,9 @@ STRIP_INSTALLED_PRODUCT = $(STRIP_INSTALLED_PRODUCT_$(CURRENT_VARIANT));
STRIP_INSTALLED_PRODUCT_normal = YES;
STRIP_INSTALLED_PRODUCT_debug = NO;
DEAD_CODE_STRIPPING_debug = NO;
DEAD_CODE_STRIPPING_normal = YES;
DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
// Dead code stripping needs to be on in the debug variant to avoid link errors. This is due to unconditionally
// building the MiG bindings for WebKitPluginClient even when the functions that the bindings wrap are not built.
DEAD_CODE_STRIPPING = YES;
GCC_VERSION = $(GCC_VERSION_$(XCODE_VERSION_ACTUAL));
......
......@@ -37,11 +37,8 @@
#import "WebKitErrorsPrivate.h"
#import "WebNSURLExtras.h"
#import "WebNSURLRequestExtras.h"
#import "WebKitSystemInterface.h"
extern "C" {
#import "WebKitPluginHost.h"
}
#import "WebKitSystemInterface.h"
using namespace WebCore;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment