Index: fish/functions/cross.fish ================================================================== --- fish/functions/cross.fish +++ fish/functions/cross.fish @@ -15,15 +15,10 @@ set PATH $DEVKITARM/bin $PATH set -g cross_host arm-none-eabi set -g objfw_configure_flags --with-$argv[1] case amiga - if test (count $argv) != 2 - echo 'Usage: cross amiga m68k|ppc' - return 1 - end - switch $argv[2] case m68k if test -z "$amiga_gcc_path" echo 'Please set amiga_gcc_path!' return 1 @@ -85,10 +80,31 @@ set -gx OBJCPP $CPP set -gx OBJCXX $CXX set -gx OBJCPPXX $CXXPP set -gx IPHONEOS_DEPLOYMENT_TARGET 10.0 set -g cross_host $archs[1]-apple-darwin + case mingw32 + set -l pkg + switch $argv[2] + case i686 x86_64 + set pkg mingw-w64-$argv[2]-gcc + set -g cross_host $argv[2]-w64-mingw32 + end + + if test (count $argv) != 2 -o -z "$cross_host" + echo 'Usage: cross mingw i686|x86_64' + return 1 + end + + set -l prefix (pkg_info -qp $pkg | awk '/^@cwd/ { print $2; exit }') + + if test -z "$prefix" + echo 'Please install $pkg from pkgsrc!' + return 1 + end + + set PATH $prefix/cross/$cross_host/bin $PATH case morphos set -l prefix (pkg_info -qp ppc-morphos-gcc-9 | awk '/^@cwd/ { print $2; exit }') if test -z "$prefix" Index: zshrc ================================================================== --- zshrc +++ zshrc @@ -114,11 +114,11 @@ print -Pn "\e]0;$@\a" } unset_title() { precmd() { - print -Pn "\e]0;%m:%c\a" + print -Pn "\e]0;%c ยท %m\a" __precmd } } unset_title ;;