diff --git a/bin/app/Makefile b/bin/app/Makefile index 66d01e463..11f59f88b 100644 --- a/bin/app/Makefile +++ b/bin/app/Makefile @@ -45,10 +45,10 @@ win-release: $(SRC) fonts win-debug: $(SRC) fonts $(CARGO) build $(DEBUG_FEATURES) -mv target/debug/darkfi-app.exe . -android-release: $(SRC) fonts forest_720x1080 +android-release: $(SRC) fonts forest_720x1280 podman run -v $(shell pwd)/../../:/root/darkfi -w /root/darkfi/bin/app/ -t apk cargo quad-apk build --release $(RELEASE_FEATURES) -mv $(RELEASE_APK) darkfi-app.apk -android-debug: $(SRC) fonts forest_720x1080 +android-debug: $(SRC) fonts forest_720x1280 podman run -v $(shell pwd)/../../:/root/darkfi -w /root/darkfi/bin/app/ -t apk cargo quad-apk build $(DEBUG_FEATURES) -mv $(DEBUG_APK) darkfi-app_debug.apk diff --git a/bin/app/release/macos/make-app.sh b/bin/app/release/macos/make-app.sh index 3e76a655c..cc19fe5cd 100755 --- a/bin/app/release/macos/make-app.sh +++ b/bin/app/release/macos/make-app.sh @@ -1,6 +1,6 @@ #!/bin/bash -APPDIR=darkfi.app/ +APPDIR=DarkFi.app/ rm -fr $APPDIR mkdir $APPDIR cp -r Contents $APPDIR @@ -9,6 +9,6 @@ cp ../../darkfi-app.macos $APPDIR/darkfi cp ../../data/res/mipmap-xxxhdpi/ic_launcher.png $APPDIR/darkfi.png cp -r ../../assets $APPDIR -hdiutil create -volname darkfi -srcfolder $APPDIR -ov -format UDZO darkfi.dmg +hdiutil create -volname DarkFi -srcfolder $APPDIR -ov -format UDZO darkfi.dmg #zip -r darkfi.app.zip $APPDIR diff --git a/bin/app/src/main.rs b/bin/app/src/main.rs index cb79c6404..6099f294d 100644 --- a/bin/app/src/main.rs +++ b/bin/app/src/main.rs @@ -16,6 +16,10 @@ * along with this program. If not, see . */ +// Hides the cmd.exe terminal on Windows. +// Enable this when making release builds. +#![cfg_attr(target_os = "windows", windows_subsystem = "windows")] + use clap::Parser; use darkfi::system::CondVar; use std::sync::{Arc, OnceLock}; @@ -87,10 +91,6 @@ macro_rules! d { ($($arg:tt)*) => { trace!(target: "main", $($arg)*); } } #[cfg(feature = "enable-plugins")] macro_rules! i { ($($arg:tt)*) => { trace!(target: "main", $($arg)*); } } -// Hides the cmd.exe terminal on Windows. -// Enable this when making release builds. -//#![windows_subsystem = "windows"] - fn panic_hook(panic_info: &std::panic::PanicHookInfo) { error!("panic occurred: {panic_info}"); error!("{}", std::backtrace::Backtrace::force_capture().to_string());