diff --git a/crates/advotracker/.env-bak b/crates/advotracker/.env-bak deleted file mode 100644 index 89234dc..0000000 --- a/crates/advotracker/.env-bak +++ /dev/null @@ -1,16 +0,0 @@ -### -# .env -# will overwrite standard environment viariables -### -# set the language variable used in test-runs -#test LANG=es-ES -#test LANG=it-IT -#test LANG=C -# set the language variable (overwriting standard Enviroment) -#TEST_LANG=de_DE -#TEST_LANG=C -#RUST_LOG=advotracker=trace -RUST_LOG=trace -#RUST_LOG=none -USERNAME=hiedemann -DB_DRIVER=sqlite diff --git a/crates/advotracker/POLLFNR_WOECHENTLICH_full.txt b/crates/advotracker/POLLFNR_WOECHENTLICH_full.txt deleted file mode 120000 index 3a64a29..0000000 --- a/crates/advotracker/POLLFNR_WOECHENTLICH_full.txt +++ /dev/null @@ -1 +0,0 @@ -data/POLLFNR_WOECHENTLICH.txt \ No newline at end of file diff --git a/crates/advotracker_client/Cargo.toml b/crates/advotracker_client/Cargo.toml index f729c62..318d5ad 100644 --- a/crates/advotracker_client/Cargo.toml +++ b/crates/advotracker_client/Cargo.toml @@ -9,15 +9,23 @@ edition = "2018" default-run = "advotracker" build = "build.rs" +#[target.x86_64-pc-windows-gnu] +#linker = "lld-link" + + +#[target.x86_64-pc-windows-msvc] +#linker = "lld-link" +# linker path on msvc set via system environment +#linker = "link.exe" +##windres = { git = "https://github.com/FaultyRAM/windres-rs", branch = "master" } +##diesel = { version = "1.4", features = [ "postgres", "sqlite" ] } +##winapi = { version = "0.3", features = [ "winuser" ] } + [target.'cfg(windows)'.dependencies] winapi = { version = "0.3", features = [ "winuser" ] } +windres = { git = "https://github.com/FaultyRAM/windres-rs", branch = "master" } #diesel = { version = "1.4", features = [ "postgres", "sqlite" ] } -[target.'cfg(target_os = "windows")'.build-dependencies] -winres = { version = "0.1" } -# for language constants -winapi = { version = "0.3", features = [ "winnt" ] } - [dependencies] async-stream = "~0.2" chrono = { version = "~0.4.0", features = ["serde"] } @@ -33,10 +41,10 @@ log = { version = "~0.4.8" } locales = { version = "~0.1" } maud = { version = "~0.22.1" } #orbtk = { version = "~0.3.1-alpha4" } -#orbtk = { git = "https://github.com/redox-os/orbtk.git", branch = "develop" } -orbtk = { path = "../../../orbtk" } +orbtk = { git = "https://github.com/redox-os/orbtk.git", branch = "develop" } +#orbtk = { path = "../../../orbtk" } serde = { version = "~1.0", features = ["derive"] } -sdl2 = { version = "~0.34" } +sdl2 = { version = "~0.34", features = ["bundled"] } substring = { version = "~1" } #tokio = { version = "~0.2", features = ["macros", "rt-threaded", "stream", "time"] } tracing = { version = "~0.1" } @@ -44,7 +52,8 @@ tracing-subscriber = { version = "~0.2.0", features = ["tracing-log"] } viperus = { git = "https://github.com/maurocordioli/viperus", features = ["cache", "fmt-clap", "fmt-env", "global", "watch"] } [build-dependencies] -winres = { version = "0.1" } +#winres = { version = "0.1" } +winres = { version = "0.1.11" } #[dev-dependencies] diff --git a/crates/advotracker_client/build.rs b/crates/advotracker_client/build.rs index ae87e42..3e98f45 100644 --- a/crates/advotracker_client/build.rs +++ b/crates/advotracker_client/build.rs @@ -5,15 +5,16 @@ * SPDX-License-Identifier: (0BSD or MIT) */ -use winres; +extern crate winres; fn main() { if cfg!(target_os = "windows") { - let mut res = winres::WindowsResource::new(); - res.set_icon("assets/icons/adovtracker/advotracker.ico") - .set("InternalName", "ADVOTRACKER.EXE") - // manually set version 0.1.5.2 - .set_version_info(winres::VersionInfo::PRODUCTVERSION, 0x0000000100050002); - res.compile().unwrap(); + let mut res = winres::WindowsResource::new(); + //res.set_icon(".\assets\icons\adovtracker\advotracker.ico") + res.set_icon("advotracker.ico") + .set("InternalName", "ADVOTRACKER.EXE") + // manually set version 0.1.5.2 + .set_version_info(winres::VersionInfo::PRODUCTVERSION, 0x0000000100050002); + res.compile().unwrap(); } }