From 4fd9bbbc8dfdabc41c2a452231a492966add6fc1 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Sat, 22 Dec 2012 16:23:09 -0500 Subject: [PATCH] Add x86-64 WebKit package. Makes Web+ available on x86-64. --- build/jam/BuildFeatures | 9 ++++++--- build/jam/OptionalPackages | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures index 0c84142ffe..fa806de919 100644 --- a/build/jam/BuildFeatures +++ b/build/jam/BuildFeatures @@ -545,10 +545,13 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] { HAIKU_BUILD_FEATURE_WEBKIT = 1 ; } -HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86-gcc4-2012-08-31a.zip ; - +if $(TARGET_ARCH) = x86 { + HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86-gcc4-2012-08-31a.zip ; +} else if $(TARGET_ARCH) = x86_64 { + HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86_64-gcc4-2012-12-22.zip ; +} if $(HAIKU_BUILD_FEATURE_WEBKIT) { - if $(TARGET_ARCH) != x86 { + if $(TARGET_ARCH) != x86 && $(TARGET_ARCH) != x86_64 { Echo "WebKit support not available on $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) < 4 { if ! $(isHybridBuild) { diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 5dcac02922..ef0758e7cf 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -2157,7 +2157,7 @@ if [ IsOptionalHaikuImagePackageAdded WebKit ] { # WebPositive if [ IsOptionalHaikuImagePackageAdded WebPositive ] { - if $(TARGET_ARCH) != x86 { + if $(TARGET_ARCH) != x86 && $(TARGET_ARCH) != x86_64 { Echo "No optional package WebPositive available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) < 4 { if ! $(isHybridBuild) {