Replaced $(baseLibURL) with $(baseURL)/lib.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39400 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
@@ -27,7 +27,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
|
||||
# XiphLibs
|
||||
|
||||
|
||||
local baseLibURL = http://haiku-files.org/files/optional-packages/lib ;
|
||||
local baseURL = http://haiku-files.org/files/optional-packages ;
|
||||
local baseSourceURL = http://haiku-files.org/files/releases/r1alpha2/sources ;
|
||||
|
||||
|
||||
@@ -39,23 +39,23 @@ if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] {
|
||||
} 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 ;
|
||||
: $(baseURL)/lib/allegro-4.4.1.1-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
dumb-0.9.3-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/dumb-0.9.3-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/dumb-0.9.3-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
jgmod-0.99-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/jgmod-0.99-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/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 ;
|
||||
: $(baseURL)/lib/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 ;
|
||||
: $(baseURL)/lib/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 ;
|
||||
: $(baseURL)/lib/jgmod-0.99-x86-gcc2-2010-10-30.zip ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ if [ IsOptionalHaikuImagePackageAdded box2d ] {
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) {
|
||||
InstallOptionalHaikuImagePackage
|
||||
box2d-2.1.2-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/box2d-2.1.2-x86-gcc4-2010-10-30.zip
|
||||
: $(baseURL)/lib/box2d-2.1.2-x86-gcc4-2010-10-30.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
@@ -86,14 +86,14 @@ if [ IsOptionalHaikuImagePackageAdded fribidi ] {
|
||||
} 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
|
||||
: $(baseURL)/lib/fribidi-0.19.2-x86-gcc4-2010-10-30.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
fribidi-0.19.2-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/fribidi-0.19.2-x86-gcc2-2010-10-29.zip
|
||||
: $(baseURL)/lib/fribidi-0.19.2-x86-gcc2-2010-10-29.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
@@ -108,14 +108,14 @@ if [ IsOptionalHaikuImagePackageAdded lcms ] {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
lcms-2.0a-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/lcms-2.0a-x86-gcc4-2010-10-30.zip
|
||||
: $(baseURL)/lib/lcms-2.0a-x86-gcc4-2010-10-30.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
lcms-2.0a-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/lcms-2.0a-x86-gcc2-2010-10-29.zip
|
||||
: $(baseURL)/lib/lcms-2.0a-x86-gcc2-2010-10-29.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
@@ -130,14 +130,14 @@ if [ IsOptionalHaikuImagePackageAdded libart_lgpl ] {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip
|
||||
: $(baseURL)/lib/libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip
|
||||
: $(baseURL)/lib/libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
@@ -152,14 +152,14 @@ if [ IsOptionalHaikuImagePackageAdded libmad ] {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libmad-0.15.1-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/libmad-0.15.1-x86-gcc4-2010-10-30.zip
|
||||
: $(baseURL)/lib/libmad-0.15.1-x86-gcc4-2010-10-30.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libmad-0.15.1-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/libmad-0.15.1-x86-gcc2-2010-10-29.zip
|
||||
: $(baseURL)/lib/libmad-0.15.1-x86-gcc2-2010-10-29.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
@@ -174,14 +174,14 @@ if [ IsOptionalHaikuImagePackageAdded libmikmod ] {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libmikmod-3.1.11-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/libmikmod-3.1.11-x86-gcc4-2010-10-30.zip
|
||||
: $(baseURL)/lib/libmikmod-3.1.11-x86-gcc4-2010-10-30.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
|
||||
: $(baseURL)/lib/libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
@@ -196,14 +196,14 @@ if [ IsOptionalHaikuImagePackageAdded libmodplug ] {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libmodplug-0.8.7-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/libmodplug-0.8.7-x86-gcc4-2010-10-30.zip
|
||||
: $(baseURL)/lib/libmodplug-0.8.7-x86-gcc4-2010-10-30.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libmodplug-0.8.7-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/libmodplug-0.8.7-x86-gcc2-2010-10-29.zip
|
||||
: $(baseURL)/lib/libmodplug-0.8.7-x86-gcc2-2010-10-29.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
@@ -218,14 +218,14 @@ if [ IsOptionalHaikuImagePackageAdded libpaper ] {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libpaper-1.1.24-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/libpaper-1.1.24-x86-gcc4-2010-10-30.zip
|
||||
: $(baseURL)/lib/libpaper-1.1.24-x86-gcc4-2010-10-30.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libpaper-1.1.24-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/libpaper-1.1.24-x86-gcc2-2010-10-29.zip
|
||||
: $(baseURL)/lib/libpaper-1.1.24-x86-gcc2-2010-10-29.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
@@ -240,14 +240,14 @@ if [ IsOptionalHaikuImagePackageAdded physfs ] {
|
||||
} 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
|
||||
: $(baseURL)/lib/physfs-2.0.1-x86-gcc4-2010-10-30.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
physfs-2.0.1-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/physfs-2.0.1-x86-gcc2-2010-10-29.zip
|
||||
: $(baseURL)/lib/physfs-2.0.1-x86-gcc2-2010-10-29.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
@@ -262,77 +262,77 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
|
||||
} 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 ;
|
||||
: $(baseURL)/lib/libsdl-1.2-hg-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
guilib-1.2.1-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/guilib-1.2.1-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/guilib-1.2.1-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-gfx-2.0.20-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/sdl-gfx-2.0.20-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/sdl-gfx-2.0.20-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-image-1.2.10-x86-gcc2-2010-10-30.zip
|
||||
: $(baseLibURL)/sdl-image-1.2.10-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/sdl-image-1.2.10-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-mixer-1.2.11-x86-gcc2-2010-10-30.zip
|
||||
: $(baseLibURL)/sdl-mixer-1.2.11-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/sdl-mixer-1.2.11-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-net-1.2.7-x86-gcc2-2010-10-30.zip
|
||||
: $(baseLibURL)/sdl-net-1.2.7-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/sdl-net-1.2.7-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-sound-1.0.3-x86-gcc2-2010-10-30.zip
|
||||
: $(baseLibURL)/sdl-sound-1.0.3-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/sdl-sound-1.0.3-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sge-030809-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/sge-030809-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/sge-030809-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
smjpeg-0.2.1-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/smjpeg-0.2.1-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/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 ;
|
||||
: $(baseURL)/lib/smpeg-0.4.5-x86-gcc4-2010-10-29.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libsdl-1.2-hg-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/libsdl-1.2-hg-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/libsdl-1.2-hg-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
guilib-1.2.1-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/guilib-1.2.1-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/guilib-1.2.1-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-gfx-2.0.20-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/sdl-gfx-2.0.20-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/sdl-gfx-2.0.20-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-image-1.2.10-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/sdl-image-1.2.10-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/sdl-image-1.2.10-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-mixer-1.2.11-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/sdl-mixer-1.2.11-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/sdl-mixer-1.2.11-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-net-1.2.7-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/sdl-net-1.2.7-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/sdl-net-1.2.7-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-sound-1.0.3-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/sdl-sound-1.0.3-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/sdl-sound-1.0.3-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-rtf-0.1.0-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/sdl-rtf-0.1.0-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/sdl-rtf-0.1.0-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sdl-ttf-2.0.10-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/sdl-ttf-2.0.10-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/sdl-ttf-2.0.10-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
sge-030809-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/sge-030809-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/sge-030809-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
smjpeg-0.2.1-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/smjpeg-0.2.1-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/smjpeg-0.2.1-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
smpeg-0.4.5-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/smpeg-0.4.5-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/smpeg-0.4.5-x86-gcc2-2010-10-29.zip ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -344,47 +344,47 @@ if [ IsOptionalHaikuImagePackageAdded XiphLibs ] {
|
||||
} 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 ;
|
||||
: $(baseURL)/lib/flac-1.2.1-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
libao-1.0.0-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/libao-1.0.0-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/libao-1.0.0-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
libogg-1.2.0-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/libogg-1.2.0-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/libogg-1.2.0-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
libtheora-1.1.1-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/libtheora-1.1.1-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/libtheora-1.1.1-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
libvorbis-1.3.1-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/libvorbis-1.3.1-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/libvorbis-1.3.1-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
speex-1.2-git-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/speex-1.2-git-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/speex-1.2-git-x86-gcc4-2010-10-30.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
vorbis-tools-1.4.0-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/vorbis-tools-1.4.0-x86-gcc4-2010-10-30.zip ;
|
||||
: $(baseURL)/lib/vorbis-tools-1.4.0-x86-gcc4-2010-10-30.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
flac-1.2.1-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/flac-1.2.1-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/flac-1.2.1-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
libao-1.0.0-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/libao-1.0.0-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/libao-1.0.0-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
libogg-1.2.0-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/libogg-1.2.0-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/libogg-1.2.0-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
libtheora-1.1.1-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/libtheora-1.1.1-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/libtheora-1.1.1-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
libvorbis-1.3.1-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/libvorbis-1.3.1-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/libvorbis-1.3.1-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
speex-1.2-git-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/speex-1.2-git-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/speex-1.2-git-x86-gcc2-2010-10-29.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
vorbis-tools-1.4.0-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/vorbis-tools-1.4.0-x86-gcc2-2010-10-29.zip ;
|
||||
: $(baseURL)/lib/vorbis-tools-1.4.0-x86-gcc2-2010-10-29.zip ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -94,7 +94,6 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
|
||||
# Yasm - the assembler utility
|
||||
|
||||
local baseURL = http://haiku-files.org/files/optional-packages ;
|
||||
local baseLibURL = http://haiku-files.org/files/optional-packages/lib ;
|
||||
local baseSourceURL = http://haiku-files.org/files/releases/r1alpha2/sources ;
|
||||
|
||||
# ABI-compliance-checker
|
||||
@@ -936,14 +935,14 @@ if [ IsOptionalHaikuImagePackageAdded LibEvent ] {
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libevent-1.4.13-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/libevent-1.4.13-x86-gcc4-2010-10-30.zip
|
||||
: $(baseURL)/lib/libevent-1.4.13-x86-gcc4-2010-10-30.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libevent-1.4.13-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/libevent-1.4.13-x86-gcc2-2010-10-29.zip
|
||||
: $(baseURL)/lib/libevent-1.4.13-x86-gcc2-2010-10-29.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
@@ -991,12 +990,12 @@ if [ IsOptionalHaikuImagePackageAdded Libmng ] {
|
||||
Echo "No optional package Libmng available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage libmng-1.0.10-x86-gcc4-2010-10-30.zip
|
||||
: $(baseLibURL)/libmng-1.0.10-x86-gcc4-2010-10-30.zip
|
||||
: $(baseURL)/lib/libmng-1.0.10-x86-gcc4-2010-10-30.zip
|
||||
:
|
||||
;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage libmng-1.0.10-x86-gcc2-2010-10-29.zip
|
||||
: $(baseLibURL)/libmng-1.0.10-x86-gcc2-2010-10-29.zip
|
||||
: $(baseURL)/lib/libmng-1.0.10-x86-gcc2-2010-10-29.zip
|
||||
:
|
||||
;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user