Skip to content
Snippets Groups Projects
Commit 5df67123 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Do not require mesa for iced and libcosmic

parent 7aa519b0
No related branches found
No related tags found
No related merge requests found
...@@ -4,28 +4,17 @@ branch = "redox" ...@@ -4,28 +4,17 @@ branch = "redox"
[build] [build]
template = "custom" template = "custom"
dependencies = [
"llvm",
"mesa",
"zlib"
]
script = """ script = """
EXAMPLES=( EXAMPLES=(
game_of_life
solar_system
styling styling
tour
) )
set -x set -x
for example in "${EXAMPLES[@]}" for example in "${EXAMPLES[@]}"
do do
${COOKBOOK_CARGO} rustc \ ${COOKBOOK_CARGO} build \
--release \ --release \
--manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \ --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
--package "${example}" \ --package "${example}"
-- \
-L "${COOKBOOK_SYSROOT}/lib" \
-C link-args="-Wl,-Bstatic $("${TARGET}-pkg-config" --libs osmesa) -lz -lstdc++ -lc -lgcc"
mkdir -pv "${COOKBOOK_STAGE}/bin" mkdir -pv "${COOKBOOK_STAGE}/bin"
cp -v "target/${TARGET}/release/${example}" "${COOKBOOK_STAGE}/bin/iced_${example}" cp -v "target/${TARGET}/release/${example}" "${COOKBOOK_STAGE}/bin/iced_${example}"
done done
......
...@@ -4,20 +4,12 @@ branch = "redox" ...@@ -4,20 +4,12 @@ branch = "redox"
[build] [build]
template = "custom" template = "custom"
dependencies = [
"llvm",
"mesa",
"zlib"
]
script = """ script = """
set -x set -x
${COOKBOOK_CARGO} rustc \ ${COOKBOOK_CARGO} build \
--release \ --release \
--manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \ --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
--package cosmic \ --package cosmic
-- \
-L "${COOKBOOK_SYSROOT}/lib" \
-C link-args="-Wl,-Bstatic $("${PKG_CONFIG}" --libs osmesa) -lz -lstdc++ -lc -lgcc"
mkdir -pv "${COOKBOOK_STAGE}/bin" mkdir -pv "${COOKBOOK_STAGE}/bin"
cp -v "target/${TARGET}/release/cosmic" "${COOKBOOK_STAGE}/bin/libcosmic" cp -v "target/${TARGET}/release/cosmic" "${COOKBOOK_STAGE}/bin/libcosmic"
""" """
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment