Fix 64-bit Mac build.
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Mar 2008 09:40:57 +0000 (09:40 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Mar 2008 09:40:57 +0000 (09:40 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30826 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/WebCore.xcodeproj/project.pbxproj

index 2c5baf71a790c0f27fa994387a55f2797bd9b167..0fe6fe6ae0314d482720a4cc8f501c1df815ad1d 100644 (file)
@@ -1,3 +1,10 @@
+2008-03-06  Mark Rowe  <mrowe@apple.com>
+
+        Fix 64-bit Mac build.
+
+        * WebCore.xcodeproj/project.pbxproj:  Exclude _NPN symbols from the exports list as they
+        are compiled out of 64-bit builds.
+
 2008-03-06  Mark Rowe  <mrowe@apple.com>
 
         Leopard build fix.
index 7c65511fc4e08155b2d95bde972dfaf65f04391f..accf6306a7c4070559503c4fda343ce1073d11a2 100644 (file)
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "# corrections for 64-bit\nsed -e s/7_NSRect/6CGRect/ -e s/7_NSSize/6CGSize/ -e s/8_NSPoint/7CGPoint/ -e s/^__ZN7WebCore5Frame20windowScriptNPObjectEv$// \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp\"\ncat \"${SRCROOT}/WebCore.LP64.exp\" >> \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp\"\n";
+                       shellScript = "# Corrections for 64-bit\n# 1) Exclude _NPN_ symbols as NPAPI support is disabled in 64-bit\n# 2) Switch NSRect, NSSize and NSPoint with their CG counterparts\n# 3) Append any 64-bit only symbols from WebCore.LP64.exp\ngrep -v \"^__NPN_\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.exp\" | sed -e s/7_NSRect/6CGRect/ -e s/7_NSSize/6CGSize/ -e s/8_NSPoint/7CGPoint/ -e s/^__ZN7WebCore5Frame20windowScriptNPObjectEv$// > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp\"\ncat \"${SRCROOT}/WebCore.LP64.exp\" >> \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp\"\n";
                };
                5D2F7DA00C6879C600B5B72B /* Update Info.plist with version information */ = {
                        isa = PBXShellScriptBuildPhase;