i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into x86_64

Browse Source
This commit is contained in:
Alex Smith
2012-07-12 11:33:39 +01:00
parent c3f0fd28cd 8c51cca27e
commit 98614a9658
199 changed files with 755 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalBuildFeatures
+1 -1
View File
@@ -421,7 +421,7 @@ if $(HAIKU_BUILD_FEATURE_TAGLIB) {
# WebKit
HAIKU_WEBKIT_FILE = webkit-0.1.1-x86-gcc4-2012-07-03.zip ;
HAIKU_WEBKIT_FILE = haikuwebkit-1.1.2-x86-gcc4-2012-07-11.zip ;
if $(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) < 4 {
Echo "WebKit support not available on gcc $(HAIKU_GCC_VERSION[1])" ;