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

Fix indentation for box2d

Browse Source 
Fix url for libevent
Changed baselibURL to baseLibURL


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39273 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Scott McCreary
2010-11-02 15:18:59 +00:00
parent f316c81731
commit f735809f0b
2 changed files with 70 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalLibPackages
+67 -67
View File
@@ -27,7 +27,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# XiphLibs # XiphLibs
local baselibURL = http://haiku-files.org/files/optional-packages/lib ; local baseLibURL = http://haiku-files.org/files/optional-packages/lib ;
local baseSourceURL = http://haiku-files.org/files/releases/r1alpha2/sources ; local baseSourceURL = http://haiku-files.org/files/releases/r1alpha2/sources ;
@@ -39,23 +39,23 @@ if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
allegro-4.4.1.1-x86-gcc4-2010-10-30.zip allegro-4.4.1.1-x86-gcc4-2010-10-30.zip
: $(baselibURL)/allegro-4.4.1.1-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/allegro-4.4.1.1-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
dumb-0.9.3-x86-gcc4-2010-10-30.zip dumb-0.9.3-x86-gcc4-2010-10-30.zip
: $(baselibURL)/dumb-0.9.3-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/dumb-0.9.3-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
jgmod-0.99-x86-gcc4-2010-10-30.zip jgmod-0.99-x86-gcc4-2010-10-30.zip
: $(baselibURL)/jgmod-0.99-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/jgmod-0.99-x86-gcc4-2010-10-30.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
allegro-4.4.1.1-x86-gcc2-2010-10-30.zip allegro-4.4.1.1-x86-gcc2-2010-10-30.zip
: $(baselibURL)/allegro-4.4.1.1-x86-gcc2-2010-10-30.zip ; : $(baseLibURL)/allegro-4.4.1.1-x86-gcc2-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
dumb-0.9.3-x86-gcc2-2010-10-30.zip dumb-0.9.3-x86-gcc2-2010-10-30.zip
: $(baselibURL)/dumb-0.9.3-x86-gcc2-2010-10-30.zip ; : $(baseLibURL)/dumb-0.9.3-x86-gcc2-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
jgmod-0.99-x86-gcc2-2010-10-30.zip jgmod-0.99-x86-gcc2-2010-10-30.zip
: $(baselibURL)/jgmod-0.99-x86-gcc2-2010-10-30.zip ; : $(baseLibURL)/jgmod-0.99-x86-gcc2-2010-10-30.zip ;
} }
} }
@@ -66,12 +66,12 @@ if [ IsOptionalHaikuImagePackageAdded box2d ] {
Echo "No optional package box2d available for $(TARGET_ARCH)" ; Echo "No optional package box2d available for $(TARGET_ARCH)" ;
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) { if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
box2d-2.1.2-x86-gcc4-2010-10-30.zip box2d-2.1.2-x86-gcc4-2010-10-30.zip
: $(baselibURL)/box2d-2.1.2-x86-gcc4-2010-10-30.zip : $(baseLibURL)/box2d-2.1.2-x86-gcc4-2010-10-30.zip
: :
: true : true
; ;
} else { } else {
Echo "No optional package box2d available for $(TARGET_ARCH)-gcc2" ; Echo "No optional package box2d available for $(TARGET_ARCH)-gcc2" ;
} }
@@ -86,14 +86,14 @@ if [ IsOptionalHaikuImagePackageAdded fribidi ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
fribidi-0.19.2-x86-gcc4-2010-10-30.zip fribidi-0.19.2-x86-gcc4-2010-10-30.zip
: $(baselibURL)/fribidi-0.19.2-x86-gcc4-2010-10-30.zip : $(baseLibURL)/fribidi-0.19.2-x86-gcc4-2010-10-30.zip
: :
: true : true
; ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
fribidi-0.19.2-x86-gcc2-2010-10-29.zip fribidi-0.19.2-x86-gcc2-2010-10-29.zip
: $(baselibURL)/fribidi-0.19.2-x86-gcc2-2010-10-29.zip : $(baseLibURL)/fribidi-0.19.2-x86-gcc2-2010-10-29.zip
: :
: true : true
; ;
@@ -108,14 +108,14 @@ if [ IsOptionalHaikuImagePackageAdded lcms ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
lcms-2.0a-x86-gcc4-2010-10-30.zip lcms-2.0a-x86-gcc4-2010-10-30.zip
: $(baselibURL)/lcms-2.0a-x86-gcc4-2010-10-30.zip : $(baseLibURL)/lcms-2.0a-x86-gcc4-2010-10-30.zip
: :
: true : true
; ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
lcms-2.0a-x86-gcc2-2010-10-29.zip lcms-2.0a-x86-gcc2-2010-10-29.zip
: $(baselibURL)/lcms-2.0a-x86-gcc2-2010-10-29.zip : $(baseLibURL)/lcms-2.0a-x86-gcc2-2010-10-29.zip
: :
: true : true
; ;
@@ -130,14 +130,14 @@ if [ IsOptionalHaikuImagePackageAdded libart_lgpl ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip
: $(baselibURL)/libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip : $(baseLibURL)/libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip
: :
: true : true
; ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip
: $(baselibURL)/libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip : $(baseLibURL)/libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip
: :
: true : true
; ;
@@ -152,14 +152,14 @@ if [ IsOptionalHaikuImagePackageAdded libmad ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libmad-0.15.1-x86-gcc4-2010-10-30.zip libmad-0.15.1-x86-gcc4-2010-10-30.zip
: $(baselibURL)/libmad-0.15.1-x86-gcc4-2010-10-30.zip : $(baseLibURL)/libmad-0.15.1-x86-gcc4-2010-10-30.zip
: :
: true : true
; ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libmad-0.15.1-x86-gcc2-2010-10-29.zip libmad-0.15.1-x86-gcc2-2010-10-29.zip
: $(baselibURL)/libmad-0.15.1-x86-gcc2-2010-10-29.zip : $(baseLibURL)/libmad-0.15.1-x86-gcc2-2010-10-29.zip
: :
: true : true
; ;
@@ -174,14 +174,14 @@ if [ IsOptionalHaikuImagePackageAdded libmikmod ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libmikmod-3.1.11-x86-gcc4-2010-10-30.zip libmikmod-3.1.11-x86-gcc4-2010-10-30.zip
: $(baselibURL)/libmikmod-3.1.11-x86-gcc4-2010-10-30.zip : $(baseLibURL)/libmikmod-3.1.11-x86-gcc4-2010-10-30.zip
: :
: true : true
; ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libmikmod-3.1.11-x86-gcc2-2010-10-29.zip libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
: $(baselibURL)/libmikmod-3.1.11-x86-gcc2-2010-10-29.zip : $(baseLibURL)/libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
: :
: true : true
; ;
@@ -196,14 +196,14 @@ if [ IsOptionalHaikuImagePackageAdded libmodplug ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libmodplug-0.8.7-x86-gcc4-2010-10-30.zip libmodplug-0.8.7-x86-gcc4-2010-10-30.zip
: $(baselibURL)/libmodplug-0.8.7-x86-gcc4-2010-10-30.zip : $(baseLibURL)/libmodplug-0.8.7-x86-gcc4-2010-10-30.zip
: :
: true : true
; ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libmodplug-0.8.7-x86-gcc2-2010-10-29.zip libmodplug-0.8.7-x86-gcc2-2010-10-29.zip
: $(baselibURL)/libmodplug-0.8.7-x86-gcc2-2010-10-29.zip : $(baseLibURL)/libmodplug-0.8.7-x86-gcc2-2010-10-29.zip
: :
: true : true
; ;
@@ -218,14 +218,14 @@ if [ IsOptionalHaikuImagePackageAdded libpaper ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libpaper-1.1.24-x86-gcc4-2010-10-30.zip libpaper-1.1.24-x86-gcc4-2010-10-30.zip
: $(baselibURL)/libpaper-1.1.24-x86-gcc4-2010-10-30.zip : $(baseLibURL)/libpaper-1.1.24-x86-gcc4-2010-10-30.zip
: :
: true : true
; ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libpaper-1.1.24-x86-gcc2-2010-10-29.zip libpaper-1.1.24-x86-gcc2-2010-10-29.zip
: $(baselibURL)/libpaper-1.1.24-x86-gcc2-2010-10-29.zip : $(baseLibURL)/libpaper-1.1.24-x86-gcc2-2010-10-29.zip
: :
: true : true
; ;
@@ -240,14 +240,14 @@ if [ IsOptionalHaikuImagePackageAdded physfs ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
physfs-2.0.1-x86-gcc4-2010-10-30.zip physfs-2.0.1-x86-gcc4-2010-10-30.zip
: $(baselibURL)/physfs-2.0.1-x86-gcc4-2010-10-30.zip : $(baseLibURL)/physfs-2.0.1-x86-gcc4-2010-10-30.zip
: :
: true : true
; ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
physfs-2.0.1-x86-gcc2-2010-10-29.zip physfs-2.0.1-x86-gcc2-2010-10-29.zip
: $(baselibURL)/physfs-2.0.1-x86-gcc2-2010-10-29.zip : $(baseLibURL)/physfs-2.0.1-x86-gcc2-2010-10-29.zip
: :
: true : true
; ;
@@ -262,77 +262,77 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libsdl-1.2-hg-x86-gcc4-2010-10-30.zip libsdl-1.2-hg-x86-gcc4-2010-10-30.zip
: $(baselibURL)/libsdl-1.2-hg-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/libsdl-1.2-hg-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
guilib-1.2.1-x86-gcc4-2010-10-30.zip guilib-1.2.1-x86-gcc4-2010-10-30.zip
: $(baselibURL)/guilib-1.2.1-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/guilib-1.2.1-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sdl-gfx-2.0.20-x86-gcc4-2010-10-30.zip sdl-gfx-2.0.20-x86-gcc4-2010-10-30.zip
: $(baselibURL)/sdl-gfx-2.0.20-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/sdl-gfx-2.0.20-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sdl-image-1.2.10-x86-gcc2-2010-10-30.zip sdl-image-1.2.10-x86-gcc2-2010-10-30.zip
: $(baselibURL)/sdl-image-1.2.10-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/sdl-image-1.2.10-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sdl-mixer-1.2.11-x86-gcc2-2010-10-30.zip sdl-mixer-1.2.11-x86-gcc2-2010-10-30.zip
: $(baselibURL)/sdl-mixer-1.2.11-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/sdl-mixer-1.2.11-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sdl-net-1.2.7-x86-gcc2-2010-10-30.zip sdl-net-1.2.7-x86-gcc2-2010-10-30.zip
: $(baselibURL)/sdl-net-1.2.7-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/sdl-net-1.2.7-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sdl-sound-1.0.3-x86-gcc2-2010-10-30.zip sdl-sound-1.0.3-x86-gcc2-2010-10-30.zip
: $(baselibURL)/sdl-sound-1.0.3-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/sdl-sound-1.0.3-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip
: $(baselibURL)/sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip
: $(baselibURL)/sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sge-030809-x86-gcc4-2010-10-30.zip sge-030809-x86-gcc4-2010-10-30.zip
: $(baselibURL)/sge-030809-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/sge-030809-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
smjpeg-0.2.1-x86-gcc4-2010-10-30.zip smjpeg-0.2.1-x86-gcc4-2010-10-30.zip
: $(baselibURL)/smjpeg-0.2.1-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/smjpeg-0.2.1-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
smpeg-0.4.5-x86-gcc4-2010-10-29.zip 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 { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libsdl-1.2-hg-x86-gcc2-2010-10-29.zip libsdl-1.2-hg-x86-gcc2-2010-10-29.zip
: $(baselibURL)/libsdl-1.2-hg-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/libsdl-1.2-hg-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
guilib-1.2.1-x86-gcc2-2010-10-29.zip guilib-1.2.1-x86-gcc2-2010-10-29.zip
: $(baselibURL)/guilib-1.2.1-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/guilib-1.2.1-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sdl-gfx-2.0.20-x86-gcc2-2010-10-29.zip sdl-gfx-2.0.20-x86-gcc2-2010-10-29.zip
: $(baselibURL)/sdl-gfx-2.0.20-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/sdl-gfx-2.0.20-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sdl-image-1.2.10-x86-gcc2-2010-10-29.zip sdl-image-1.2.10-x86-gcc2-2010-10-29.zip
: $(baselibURL)/sdl-image-1.2.10-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/sdl-image-1.2.10-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sdl-mixer-1.2.11-x86-gcc2-2010-10-29.zip sdl-mixer-1.2.11-x86-gcc2-2010-10-29.zip
: $(baselibURL)/sdl-mixer-1.2.11-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/sdl-mixer-1.2.11-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sdl-net-1.2.7-x86-gcc2-2010-10-29.zip sdl-net-1.2.7-x86-gcc2-2010-10-29.zip
: $(baselibURL)/sdl-net-1.2.7-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/sdl-net-1.2.7-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sdl-sound-1.0.3-x86-gcc2-2010-10-29.zip sdl-sound-1.0.3-x86-gcc2-2010-10-29.zip
: $(baselibURL)/sdl-sound-1.0.3-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/sdl-sound-1.0.3-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sdl-rtf-0.1.0-x86-gcc2-2010-10-29.zip sdl-rtf-0.1.0-x86-gcc2-2010-10-29.zip
: $(baselibURL)/sdl-rtf-0.1.0-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/sdl-rtf-0.1.0-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sdl-ttf-2.0.10-x86-gcc2-2010-10-29.zip sdl-ttf-2.0.10-x86-gcc2-2010-10-29.zip
: $(baselibURL)/sdl-ttf-2.0.10-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/sdl-ttf-2.0.10-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sge-030809-x86-gcc2-2010-10-29.zip sge-030809-x86-gcc2-2010-10-29.zip
: $(baselibURL)/sge-030809-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/sge-030809-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
smjpeg-0.2.1-x86-gcc2-2010-10-29.zip smjpeg-0.2.1-x86-gcc2-2010-10-29.zip
: $(baselibURL)/smjpeg-0.2.1-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/smjpeg-0.2.1-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
smpeg-0.4.5-x86-gcc2-2010-10-29.zip smpeg-0.4.5-x86-gcc2-2010-10-29.zip
: $(baselibURL)/smpeg-0.4.5-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/smpeg-0.4.5-x86-gcc2-2010-10-29.zip ;
} }
} }
@@ -344,47 +344,47 @@ if [ IsOptionalHaikuImagePackageAdded XiphLibs ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
flac-1.2.1-x86-gcc4-2010-10-30.zip flac-1.2.1-x86-gcc4-2010-10-30.zip
: $(baselibURL)/flac-1.2.1-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/flac-1.2.1-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libao-1.0.0-x86-gcc4-2010-10-30.zip libao-1.0.0-x86-gcc4-2010-10-30.zip
: $(baselibURL)/libao-1.0.0-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/libao-1.0.0-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libogg-1.2.0-x86-gcc4-2010-10-30.zip libogg-1.2.0-x86-gcc4-2010-10-30.zip
: $(baselibURL)/libogg-1.2.0-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/libogg-1.2.0-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libtheora-1.1.1-x86-gcc4-2010-10-30.zip libtheora-1.1.1-x86-gcc4-2010-10-30.zip
: $(baselibURL)/libtheora-1.1.1-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/libtheora-1.1.1-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libvorbis-1.3.1-x86-gcc4-2010-10-30.zip libvorbis-1.3.1-x86-gcc4-2010-10-30.zip
: $(baselibURL)/libvorbis-1.3.1-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/libvorbis-1.3.1-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
speex-1.2-git-x86-gcc4-2010-10-30.zip speex-1.2-git-x86-gcc4-2010-10-30.zip
: $(baselibURL)/speex-1.2-git-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/speex-1.2-git-x86-gcc4-2010-10-30.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
vorbis-tools-1.4.0-x86-gcc4-2010-10-30.zip vorbis-tools-1.4.0-x86-gcc4-2010-10-30.zip
: $(baselibURL)/vorbis-tools-1.4.0-x86-gcc4-2010-10-30.zip ; : $(baseLibURL)/vorbis-tools-1.4.0-x86-gcc4-2010-10-30.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
flac-1.2.1-x86-gcc2-2010-10-29.zip flac-1.2.1-x86-gcc2-2010-10-29.zip
: $(baselibURL)/flac-1.2.1-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/flac-1.2.1-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libao-1.0.0-x86-gcc2-2010-10-29.zip libao-1.0.0-x86-gcc2-2010-10-29.zip
: $(baselibURL)/libao-1.0.0-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/libao-1.0.0-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libogg-1.2.0-x86-gcc2-2010-10-29.zip libogg-1.2.0-x86-gcc2-2010-10-29.zip
: $(baselibURL)/libogg-1.2.0-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/libogg-1.2.0-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libtheora-1.1.1-x86-gcc2-2010-10-29.zip libtheora-1.1.1-x86-gcc2-2010-10-29.zip
: $(baselibURL)/libtheora-1.1.1-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/libtheora-1.1.1-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libvorbis-1.3.1-x86-gcc2-2010-10-29.zip libvorbis-1.3.1-x86-gcc2-2010-10-29.zip
: $(baselibURL)/libvorbis-1.3.1-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/libvorbis-1.3.1-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
speex-1.2-git-x86-gcc2-2010-10-29.zip speex-1.2-git-x86-gcc2-2010-10-29.zip
: $(baselibURL)/speex-1.2-git-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/speex-1.2-git-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
vorbis-tools-1.4.0-x86-gcc2-2010-10-29.zip vorbis-tools-1.4.0-x86-gcc2-2010-10-29.zip
: $(baselibURL)/vorbis-tools-1.4.0-x86-gcc2-2010-10-29.zip ; : $(baseLibURL)/vorbis-tools-1.4.0-x86-gcc2-2010-10-29.zip ;
} }
} }
build/jam/OptionalPackages
+3 -2
View File
@@ -94,6 +94,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# Yasm - the assembler utility # Yasm - the assembler utility
local baseURL = http://haiku-files.org/files/optional-packages ; local baseURL = http://haiku-files.org/files/optional-packages ;
local baseLibURL = http://haiku-files.org/files/optional-packages ;
local baseSourceURL = http://haiku-files.org/files/releases/r1alpha2/sources ; local baseSourceURL = http://haiku-files.org/files/releases/r1alpha2/sources ;
# ABI-compliance-checker # ABI-compliance-checker
@@ -935,14 +936,14 @@ if [ IsOptionalHaikuImagePackageAdded LibEvent ] {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libevent-1.4.13-x86-gcc4-2010-10-30.zip libevent-1.4.13-x86-gcc4-2010-10-30.zip
: $(baseURL)/libevent-1.4.13-x86-gcc4-2010-10-30.zip : $(baseLibURL)/libevent-1.4.13-x86-gcc4-2010-10-30.zip
: :
: true : true
; ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libevent-1.4.13-x86-gcc2-2010-10-29.zip libevent-1.4.13-x86-gcc2-2010-10-29.zip
: $(baseURL)/libevent-1.4.13-x86-gcc2-2010-10-29.zip : $(baseLibURL)/libevent-1.4.13-x86-gcc2-2010-10-29.zip
: :
: true : true
; ;