Rename SIXTYFPS_EMBED_RESOURCES environment variable

This commit is contained in:
Simon Hausmann 2022-02-02 09:10:52 +01:00
parent 017da5b3b4
commit 7382ea1f2c
3 changed files with 4 additions and 4 deletions

View file

@ -235,7 +235,7 @@ jobs:
- name: Enable test coverage for resource embedding in C++ when building examples
if: matrix.os == 'ubuntu-20.04'
run: |
echo "SIXTYFPS_EMBED_RESOURCES=true" >> $GITHUB_ENV
echo "SLINT_EMBED_RESOURCES=true" >> $GITHUB_ENV
- name: C++ Build
uses: lukka/run-cmake@v3.4
with:

View file

@ -74,10 +74,10 @@ pub struct CompilerConfiguration {
impl CompilerConfiguration {
pub fn new(output_format: crate::generator::OutputFormat) -> Self {
let embed_resources = match std::env::var("SIXTYFPS_EMBED_RESOURCES") {
let embed_resources = match std::env::var("SLINT_EMBED_RESOURCES") {
Ok(var) => {
var.parse().unwrap_or_else(|_|{
panic!("SIXTYFPS_EMBED_RESOURCES has incorrect value. Must be either unset, 'true' or 'false'")
panic!("SLINT_EMBED_RESOURCES has incorrect value. Must be either unset, 'true' or 'false'")
})
}
Err(_) => {

View file

@ -49,7 +49,7 @@ fn main() -> std::io::Result<()> {
// By default resources are embedded. The WASM example builds provide test coverage for that. This switch
// provides test coverage for the non-embedding case, compiling tests without embedding the images.
println!("cargo:rustc-env=SIXTYFPS_EMBED_RESOURCES=false");
println!("cargo:rustc-env=SLINT_EMBED_RESOURCES=false");
//Make sure to use a consistent style
println!("cargo:rustc-env=SIXTYFPS_STYLE=fluent");