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

Merge branch 'master' of ssh://git.haiku-os.org/haiku

Browse Source
This commit is contained in:
Adrien Destugues - PulkoMandy
2012-07-23 21:32:24 +02:00
parent f01f7fec8f 5cdd07a814
commit fc3f40765a
150 changed files with 1721 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalBuildFeatures
+1 -1
View File
@@ -467,7 +467,7 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
HAIKU_BUILD_FEATURE_WEBKIT = 1 ;
}
HAIKU_WEBKIT_FILE = haikuwebkit-1.1.2-x86-gcc4-2012-07-11.zip ;
HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86-gcc4-2012-07-20-1.zip ;
if $(HAIKU_BUILD_FEATURE_WEBKIT) {
if $(TARGET_ARCH) != x86 {
build/jam/OptionalPackageDependencies
+1 -1
View File
@@ -10,7 +10,7 @@ OptionalPackageDependencies ArmyKnife : TagLib ;
OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ;
OptionalPackageDependencies BeHappy : BeBook NetSurf ;
OptionalPackageDependencies BurnItNow : CDRecord ;
OptionalPackageDependencies CDRecord : LibIconv ;
OptionalPackageDependencies CDRecord : GetText LibIconv ;
OptionalPackageDependencies Curl : OpenSSL ;
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
OptionalPackageDependencies Development : DevelopmentBase Perl ;
build/jam/OptionalPackages
+4 -4
View File
@@ -409,12 +409,12 @@ if [ IsOptionalHaikuImagePackageAdded CDRecord ] {
Echo "No optional package CDRecord available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
cdrtools-3.01a06-x86-gcc4-2012-06-19.zip
: $(baseURL)/cdrtools-3.01a06-x86-gcc4-2012-06-19.zip ;
cdrtools-3.01a07-x86-gcc4-2012-06-19.zip
: $(baseURL)/cdrtools-3.01a07-x86-gcc4-2012-07-19.zip ;
} else {
InstallOptionalHaikuImagePackage
cdrtools-3.01a06-x86-gcc2-2012-06-20.zip
: $(baseURL)/cdrtools-3.01a06-x86-gcc2-2012-06-20.zip ;
cdrtools-3.01a07-x86-gcc2-2012-07-19-r2.zip
: $(baseURL)/cdrtools-3.01a07-x86-gcc2-2012-07-19-r2.zip ;
}
}