Restructured conditionals. More cleanup to come.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39207 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
parent
c917cd6261
commit
def1ceca9d
|
|
@ -2,9 +2,18 @@
|
|||
# It is directly included from HaikuImage -- all variables defined there can
|
||||
# be used
|
||||
|
||||
# Detect a hybrid GCC2/GCC4 image and disable the checks for unavailable GCC4
|
||||
# packages. (It does not matter if a package was built with either compiler,
|
||||
# the system should have the respective other system libs.)
|
||||
local isHybridBuild ;
|
||||
if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
|
||||
&& $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
|
||||
isHybridBuild = 1 ;
|
||||
}
|
||||
|
||||
|
||||
# Available Optional Lib Packages:
|
||||
# AllegroLibs
|
||||
# AllegroLibs
|
||||
# fribidi
|
||||
# lcms
|
||||
# libart_lgpl
|
||||
|
|
@ -18,7 +27,7 @@
|
|||
# physfs
|
||||
# pkgconfig
|
||||
# readline
|
||||
# XiphLibs
|
||||
# XiphLibs
|
||||
|
||||
|
||||
local baselibURL = http://haiku-files.org/files/optional-packages/lib ;
|
||||
|
|
@ -26,21 +35,12 @@ local baseSourceURL = http://haiku-files.org/files/releases/r1alpha2/sources ;
|
|||
|
||||
|
||||
# AllegroLibs
|
||||
if [ IsOptionalHaikuImagePackageAdded XiphLibs ]
|
||||
&& $(TARGET_ARCH) = x86 {
|
||||
if [ IsOptionalHaikuImagePackageAdded AllegroLibs ]
|
||||
# libsdl and related libs
|
||||
if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
|
||||
InstallOptionalHaikuImagePackage
|
||||
allegro-4.4.1.1-x86-gcc2-2010-10-30.zip
|
||||
: $(baselibURL)/allegro-4.4.1.1-x86-gcc2-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
dumb-0.9.3-x86-gcc2-2010-10-30.zip
|
||||
: $(baselibURL)/dumb-0.9.3-x86-gcc2-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
jgmod-0.99-x86-gcc2-2010-10-30.zip
|
||||
: $(baselibURL)/jgmod-0.99-x86-gcc2-2010-10-30.zip ;
|
||||
}
|
||||
if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package AllegroLibs available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
|
||||
Echo "No optional package AllegroLibs available for gcc4" ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# allegro-4.4.1.1-x86-gcc4-2010-10-30.zip
|
||||
# : $(baselibURL)/allegro-4.4.1.1-x86-gcc4-2010-10-30.zip ;
|
||||
|
|
@ -50,6 +50,16 @@ if [ IsOptionalHaikuImagePackageAdded XiphLibs ]
|
|||
# InstallOptionalHaikuImagePackage
|
||||
# jgmod-0.99-x86-gcc4-2010-10-30.zip
|
||||
# : $(baselibURL)/jgmod-0.99-x86-gcc4-2010-10-30.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
allegro-4.4.1.1-x86-gcc2-2010-10-30.zip
|
||||
: $(baselibURL)/allegro-4.4.1.1-x86-gcc2-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
dumb-0.9.3-x86-gcc2-2010-10-30.zip
|
||||
: $(baselibURL)/dumb-0.9.3-x86-gcc2-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
jgmod-0.99-x86-gcc2-2010-10-30.zip
|
||||
: $(baselibURL)/jgmod-0.99-x86-gcc2-2010-10-30.zip ;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -206,9 +216,44 @@ if [ IsOptionalHaikuImagePackageAdded physfs ] {
|
|||
|
||||
# SDLLibs
|
||||
if [ IsOptionalHaikuImagePackageAdded SDLLibs ]
|
||||
&& $(TARGET_ARCH) = x86 {
|
||||
# libsdl and related libs
|
||||
if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package SDLLibs available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
|
||||
Echo "No optional package SDLLibs available for gcc4" ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# libsdl-1.2-hg-x86-gcc-4-2010-10-29.zip
|
||||
# : $(baselibURL)/libsdl-1.2-hg-x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sdl-gfx-2.0.20-x86-gcc-4-2010-10-29.zip
|
||||
# : $(baselibURL)/sdl-gfx-2.0.20-x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sdl-image-1.2.10--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/sdl-image-1.2.10--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sdl-mixer-1.2.11--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/sdl-mixer-1.2.11--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sdl-net-1.2.7--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/sdl-net-1.2.7--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sdl-sound-1.0.3--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/sdl-sound-1.0.3--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sdl-rtf-0.1.0-x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/sdl-rtf-0.1.0-x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sdl-ttf-2.0.10-x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/sdl-ttf-2.0.10-x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sge-030809--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/sge-030809--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# smjpeg-0.2.1--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/smjpeg-0.2.1--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# smpeg-0.4.5--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/smpeg-0.4.5--x86-gcc4-2010-10-29.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libsdl-1.2-hg--x86-gcc-2-2010-10-29.zip
|
||||
: $(baselibURL)/libsdl-1.2-hg--x86-gcc2-2010-10-29.zip ;
|
||||
|
|
@ -246,50 +291,37 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ]
|
|||
smpeg-0.4.5--x86-gcc2-2010-10-29.zip
|
||||
: $(baselibURL)/smpeg-0.4.5--x86-gcc2-2010-10-29.zip ;
|
||||
}
|
||||
|
||||
if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# libsdl-1.2-hg-x86-gcc-4-2010-10-29.zip
|
||||
# : $(baselibURL)/libsdl-1.2-hg-x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sdl-gfx-2.0.20-x86-gcc-4-2010-10-29.zip
|
||||
# : $(baselibURL)/sdl-gfx-2.0.20-x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sdl-image-1.2.10--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/sdl-image-1.2.10--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sdl-mixer-1.2.11--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/sdl-mixer-1.2.11--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sdl-net-1.2.7--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/sdl-net-1.2.7--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sdl-sound-1.0.3--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/sdl-sound-1.0.3--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sdl-rtf-0.1.0-x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/sdl-rtf-0.1.0-x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sdl-ttf-2.0.10-x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/sdl-ttf-2.0.10-x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# sge-030809--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/sge-030809--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# smjpeg-0.2.1--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/smjpeg-0.2.1--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# smpeg-0.4.5--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/smpeg-0.4.5--x86-gcc4-2010-10-29.zip ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# XiphLibs
|
||||
if [ IsOptionalHaikuImagePackageAdded XiphLibs ]
|
||||
&& $(TARGET_ARCH) = x86 {
|
||||
# libsdl and related libs
|
||||
if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package XiphLibs available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
|
||||
Echo "No optional package XiphLibs available for gcc4" ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# flac-1.2.1--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/flac-1.2.1--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# libao-1.0.0--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/libao-1.0.0--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# libogg-1.2.0--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/libogg-1.2.0--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# libtheora-1.1.1-x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/libtheora-1.1.1-x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# libvorbis-1.3.1--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/libvorbis-1.3.1--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# speex-1.2-git--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/speex-1.2-git--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# vorbis-tools-1.4.0--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/vorbis-tools-1.4.0--x86-gcc4-2010-10-29.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
flac-1.2.1--x86-gcc2-2010-10-29.zip
|
||||
: $(baselibURL)/flac-1.2.1--x86-gcc2-2010-10-29.zip ;
|
||||
|
|
@ -312,28 +344,5 @@ if [ IsOptionalHaikuImagePackageAdded XiphLibs ]
|
|||
vorbis-tools-1.4.0--x86-gcc2-2010-10-29.zip
|
||||
: $(baselibURL)/vorbis-tools-1.4.0--x86-gcc2-2010-10-29.zip ;
|
||||
}
|
||||
if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# flac-1.2.1--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/flac-1.2.1--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# libao-1.0.0--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/libao-1.0.0--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# libogg-1.2.0--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/libogg-1.2.0--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# libtheora-1.1.1-x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/libtheora-1.1.1-x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# libvorbis-1.3.1--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/libvorbis-1.3.1--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# speex-1.2-git--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/speex-1.2-git--x86-gcc4-2010-10-29.zip ;
|
||||
# InstallOptionalHaikuImagePackage
|
||||
# vorbis-tools-1.4.0--x86-gcc4-2010-10-29.zip
|
||||
# : $(baselibURL)/vorbis-tools-1.4.0--x86-gcc4-2010-10-29.zip ;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue