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-28 16:29:41 +01:00
parent e453c0f4a7 0d47dc5dd2
commit 0efc5e72dc
335 changed files with 13904 additions and 7472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalBuildFeatures
+32
View File
@@ -342,6 +342,38 @@ if $(TARGET_ARCH) = x86 {
}
# MikMod
local mikmodBaseURL = http://haiku-files.org/files/optional-packages/lib ;
if $(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_MIKMOD_FILE = libmikmod-3.1.11-r1a3-x86-gcc4-2011-05-26.zip ;
} else {
HAIKU_MIKMOD_FILE = libmikmod-3.1.11-r1a3-x86-gcc2-2011-05-19.zip ;
}
local mikmodZipFile = [ DownloadFile $(HAIKU_MIKMOD_FILE)
: $(mikmodBaseURL)/$(HAIKU_MIKMOD_FILE) ] ;
HAIKU_MIKMOD_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
$(HAIKU_MIKMOD_FILE:B) ] ;
HAIKU_MIKMOD_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_MIKMOD_DIR)
: common/include/ : $(mikmodZipFile) : extracted-mikmod ] ;
HAIKU_MIKMOD_LIBS = [ ExtractArchive $(HAIKU_MIKMOD_DIR)
:
common/lib/libmikmod.a
: $(mikmodZipFile)
: extracted-ffmpeg ] ;
Depends $(HAIKU_MIKMOD_LIBS) : $(HAIKU_MIKMOD_HEADERS_DEPENDENCY) ;
HAIKU_MIKMOD_HEADERS = [ FDirName $(HAIKU_MIKMOD_DIR) common include ] ;
} else {
Echo "MikMod support not available on $(TARGET_ARCH)" ;
}
# Freetype
local freetypeBaseURL = $(baseURL)/lib ;
if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
build/jam/OptionalPackages
+26
View File
@@ -53,8 +53,10 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# GitDoc - documentation for the distributed version control system
# GPerf - the perfect hash function generator.
# Groff - text formatter used for man pages
# HGrep - header grep tool
# ICU-devel - the headers and lib-links for ICU (for development)
# KeymapSwitcher - Easy to use keymap switcher
# LGrep - Library Grep tool
# LibEvent - An event notification library
# LibIconv - text encoding conversion library
# LibLayout - GCC2 package needed by some BeOS apps to compile
@@ -1057,6 +1059,18 @@ if [ IsOptionalHaikuImagePackageAdded Groff ] {
}
# HGgrep
if [ IsOptionalHaikuImagePackageAdded HGrep ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package HGrep available for $(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage
hgrep-1.0.1-x86-gcc2-2012-07-23.zip
: $(baseURL)/hgrep-1.0.1-x86-gcc2-2012-07-23.zip ;
}
}
# ICU
if [ IsOptionalHaikuImagePackageAdded ICU ] {
if $(TARGET_ARCH) != x86 {
@@ -1132,6 +1146,18 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
}
# LGrep
if [ IsOptionalHaikuImagePackageAdded LGrep ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package LGrep available for $(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage
lgrep-1.0-x86-gcc2-2012-07-23.zip
: $(baseURL)/lgrep-1.0-x86-gcc2-2012-07-23.zip ;
}
}
# LibEvent
if [ IsOptionalHaikuImagePackageAdded LibEvent ] {
if $(TARGET_ARCH) != x86 {