diff --git a/Cargo.toml b/Cargo.toml index 1c9a28e..18f7965 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,8 +49,5 @@ lto = true codegen-units = 1 strip = true -[target.'cfg(windows)'.dependencies] -winres = "0.1" - [build-dependencies] winres = "0.1" \ No newline at end of file diff --git a/ae_anons-v0.2.6-all.tar.gz b/ae_anons-v0.2.6-all.tar.gz index e674f9d..7c96d8f 100644 Binary files a/ae_anons-v0.2.6-all.tar.gz and b/ae_anons-v0.2.6-all.tar.gz differ diff --git a/assets/logo.icns b/assets/logo.icns new file mode 100644 index 0000000..7cc216b Binary files /dev/null and b/assets/logo.icns differ diff --git a/makefile b/makefile index 60f67da..b7edf0f 100644 --- a/makefile +++ b/makefile @@ -67,15 +67,14 @@ define measure_time $(2); \ end=$$(date +%s); \ duration=$$((end - start)); \ + echo "$(1): $$duration сек" >> $(TIMING_FILE); \ if [ $$duration -ge 60 ]; then \ min=$$((duration / 60)); \ sec=$$((duration % 60)); \ - time_str="$${min}m $${sec}s"; \ + echo "$(GREEN)✓ $(1) завершён за $${min}m $${sec}s$(NC)"; \ else \ - time_str="$${duration}s"; \ - fi; \ - echo "$(1): $$time_str" >> $(TIMING_FILE); \ - echo "$(GREEN)✓ $(1) завершён за $$time_str$(NC)" + echo "$(GREEN)✓ $(1) завершён за $${duration}s$(NC)"; \ + fi endef define print_timing_summary @@ -136,6 +135,15 @@ favicon: @$(IMAGEMAGICK) assets/logo.png -define icon:auto-resize=48,32,16 src/static/favicon.ico @echo "$(GREEN) ✓ src/static/favicon.ico$(NC)" +# ============================================ +# ИКОНКА ДЛЯ WINDOWS +# ============================================ +windows-icon: + @if [ ! -f assets/logo.ico ]; then \ + echo "$(YELLOW)logo.ico не найден, запускаю генерацию...$(NC)"; \ + $(MAKE) icons; \ + fi + # ============================================ # ОПРЕДЕЛЕНИЕ ПЛАТФОРМЫ # ============================================ @@ -217,10 +225,10 @@ build-mac: @echo "$(GREEN)🍎 Сборка для macOS...$(NC)" @time cargo build --release -build-windows: +build-windows: windows-icon @echo "$(GREEN)🪟 Сборка для Windows x86_64...$(NC)" @time cargo build --target x86_64-pc-windows-gnu --release - + build-linux: @echo "$(GREEN)🐧 Сборка для Linux x86_64 (GNU)...$(NC)" @time cargo build --target x86_64-unknown-linux-gnu --release diff --git a/releases/ae_anons-v0.2.6-linux-gnu/ae_anons b/releases/ae_anons-v0.2.6-linux-gnu/ae_anons index 6bf5ccb..6bfd165 100755 Binary files a/releases/ae_anons-v0.2.6-linux-gnu/ae_anons and b/releases/ae_anons-v0.2.6-linux-gnu/ae_anons differ diff --git a/releases/ae_anons-v0.2.6-linux-musl/ae_anons b/releases/ae_anons-v0.2.6-linux-musl/ae_anons index 5cf6b26..9be6dd7 100755 Binary files a/releases/ae_anons-v0.2.6-linux-musl/ae_anons and b/releases/ae_anons-v0.2.6-linux-musl/ae_anons differ diff --git a/releases/ae_anons-v0.2.6-windows-x64/ae_anons.exe b/releases/ae_anons-v0.2.6-windows-x64/ae_anons.exe index 810d82e..edae320 100755 Binary files a/releases/ae_anons-v0.2.6-windows-x64/ae_anons.exe and b/releases/ae_anons-v0.2.6-windows-x64/ae_anons.exe differ