Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed several conditionals. Added a TODO about a duplicate Libmng, libmng.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39228 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia 2010-10-31 12:02:35 +00:00
parent 1c9f7a4117
commit 92dc6fdfb5
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/jam/OptionalLibPackages
View File

@ -36,7 +36,7 @@ if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] {
# libsdl and related libs
if $(TARGET_ARCH) != x86 {
Echo "No optional package AllegroLibs available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
allegro-4.4.1.1-x86-gcc4-2010-10-30.zip
: $(baselibURL)/allegro-4.4.1.1-x86-gcc4-2010-10-30.zip ;
@ -64,7 +64,7 @@ if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] {
if [ IsOptionalHaikuImagePackageAdded fribidi ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package fribidi available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
fribidi-0.19.2-x86-gcc4-2010-10-30.zip
: $(baselibURL)/fribidi-0.19.2-x86-gcc4-2010-10-30.zip
@ -143,6 +143,7 @@ if [ IsOptionalHaikuImagePackageAdded libmikmod ] {
# libmng
# TODO: Libmng exists in OptionalPackages!
if [ IsOptionalHaikuImagePackageAdded libmng ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package libmng available for $(TARGET_ARCH)" ;
@ -191,7 +192,7 @@ if [ IsOptionalHaikuImagePackageAdded libpaper ] {
if [ IsOptionalHaikuImagePackageAdded physfs ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package physfs available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
physfs-2.0.1-x86-gcc4-2010-10-30.zip
: $(baselibURL)/physfs-2.0.1-x86-gcc4-2010-10-30.zip
@ -213,7 +214,7 @@ if [ IsOptionalHaikuImagePackageAdded physfs ] {
if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package SDLLibs available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
libsdl-1.2-hg-x86-gcc4-2010-10-30.zip
: $(baselibURL)/libsdl-1.2-hg-x86-gcc4-2010-10-30.zip ;
@ -249,7 +250,7 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
: $(baselibURL)/smjpeg-0.2.1-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage
smpeg-0.4.5-x86-gcc4-2010-10-29.zip
: $(baselibURL)/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-gcc2-2010-10-29.zip
@ -295,7 +296,7 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
if [ IsOptionalHaikuImagePackageAdded XiphLibs ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package XiphLibs available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
flac-1.2.1-x86-gcc4-2010-10-30.zip
: $(baselibURL)/flac-1.2.1-x86-gcc4-2010-10-30.zip ;

18
build/jam/OptionalPackages
View File

@ -142,14 +142,8 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
if [ IsOptionalHaikuImagePackageAdded ArmyKnife ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package ArmyKnife available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package ArmyKnife for gcc4" ;
# InstallOptionalHaikuImagePackage armyknife-61-x86-gcc4-2010-10-30.zip
# : $(baseURL)/armyknife-61-x86-gcc4-2010-10-30.zip
# :
# ;
# AddSymlinkToHaikuImage home config be Applications
# : /boot/apps/ArmyKnife/ArmyKnife ;
} else {
InstallOptionalHaikuImagePackage armyknife-61-x86-gcc2-2010-10-30.zip
: $(baseURL)/armyknife-61-x86-gcc2-2010-10-30.zip
@ -1474,7 +1468,7 @@ if [ IsOptionalHaikuImagePackageAdded TagLib ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package TagLib available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package TagLib available for $(TARGET_ARCH)-gcc4" ;
} else {
InstallOptionalHaikuImagePackage
@ -1623,14 +1617,8 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
if [ IsOptionalHaikuImagePackageAdded Vision ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Vision available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package Vision for gcc4" ;
# InstallOptionalHaikuImagePackage vision-908-x86-gcc4-2010-10-30.zip
# : $(baseURL)/vision-908-x86-gcc4-2010-10-30.zip
# :
# ;
# AddSymlinkToHaikuImage home config be Applications
# : /boot/apps/Vision/Vision ;
} else {
InstallOptionalHaikuImagePackage vision-908-x86-gcc2-2010-10-30.zip
: $(baseURL)/vision-908-x86-gcc2-2010-10-30.zip