Update install paths for some recipes that compile examples, add zlib to recipes that use mesa

This commit is contained in:
Jeremy Soller 2018-12-30 11:16:28 -07:00
parent 864587540f
commit a792793b92
No known key found for this signature in database
GPG Key ID: E988B49EE78A7FB1
4 changed files with 25 additions and 3 deletions

View File

@ -1,6 +1,6 @@
GIT=https://gitlab.redox-os.org/redox-os/glutin.git
GIT_UPSTREAM=https://github.com/tomaka/glutin.git
BUILD_DEPENDS=(mesa)
BUILD_DEPENDS=(mesa zlib)
BRANCH=redox
CARGOFLAGS="--example window"
@ -12,7 +12,15 @@ function recipe_build {
-L "${sysroot}/lib" \
-l OSMesa \
-l glapi \
-l z \
-l stdc++ \
-C link-args="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
mkdir -pv "$dest/bin"
cp -v "target/${TARGET}/release/examples/window" "$dest/bin/glutin"
skip=1
}

View File

@ -1,6 +1,6 @@
GIT=https://gitlab.redox-os.org/redox-os/hematite.git
GIT_UPSTREAM=https://github.com/PistonDevelopers/hematite.git
BUILD_DEPENDS=(mesa)
BUILD_DEPENDS=(mesa zlib)
BRANCH=redox
function recipe_build {
@ -11,6 +11,7 @@ function recipe_build {
-L "${sysroot}/lib" \
-l OSMesa \
-l glapi \
-l z \
-l stdc++ \
-C link-args="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
skip=1

View File

@ -12,7 +12,13 @@ function recipe_build {
-l pixman-1 \
-l freetype \
-l png \
-l z
-l z
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
mkdir -pv "$dest/bin"
cp -v "target/${TARGET}/release/examples/gui" "$dest/bin/rust-cairo"
skip=1
}

View File

@ -2,3 +2,10 @@ GIT=https://gitlab.redox-os.org/redox-os/winit.git
GIT_UPSTREAM=https://github.com/tomaka/winit.git
BRANCH=redox
CARGOFLAGS="--example window"
function recipe_stage {
dest="$(realpath $1)"
mkdir -pv "$dest/bin"
cp -v "target/${TARGET}/release/examples/window" "$dest/bin/winit"
skip=1
}