Added more gcc4 libs, removed duplicate libmng.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39249 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Scott McCreary
2010-11-01 05:49:49 +00:00
parent 9217a573f8
commit 77d77844f9
3 changed files with 69 additions and 22 deletions
+7 -4
View File
@@ -988,11 +988,14 @@ if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
if [ IsOptionalHaikuImagePackageAdded Libmng ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Libmng available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package Libmng available for gcc4" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage libmng-1.0.10-x86-gcc4-2010-10-30.zip
: $(baseURL)/libmng-1.0.10-x86-gcc4-2010-10-30.zip
:
;
} else {
InstallOptionalHaikuImagePackage libmng-1.0.10-x86-gcc2-2010-09-26.zip
: $(baseURL)/libmng-1.0.10-x86-gcc2-2010-09-26.zip
InstallOptionalHaikuImagePackage libmng-1.0.10-x86-gcc2-2010-10-29.zip
: $(baseURL)/libmng-1.0.10-x86-gcc2-2010-10-29.zip
:
;
}