Index: config/fish/fish_variables ================================================================== --- config/fish/fish_variables +++ config/fish/fish_variables @@ -19,20 +19,20 @@ SETUVAR fish_color_error:ff0000 SETUVAR fish_color_escape:00a6b2 SETUVAR fish_color_history_current:normal SETUVAR fish_color_host:176945 SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_jobs:yellow +SETUVAR fish_color_jobs:\x2d\x2dbold\x1eyellow SETUVAR fish_color_match:normal SETUVAR fish_color_normal:normal SETUVAR fish_color_operator:cc6fdf SETUVAR fish_color_param:3377cf SETUVAR fish_color_quote:ff751a SETUVAR fish_color_redirection:bf4080 SETUVAR fish_color_search_match:ffff00 SETUVAR fish_color_selection:c0c0c0 -SETUVAR fish_color_status:red +SETUVAR fish_color_status:\x2d\x2dbold\x1ered SETUVAR fish_color_suffix:29bc7d SETUVAR fish_color_user:00ff00 SETUVAR fish_color_valid_path:normal SETUVAR fish_color_vcs:43d696 SETUVAR fish_color_vcs_braces:29bc7d Index: config/fish/functions/cross.fish ================================================================== --- config/fish/functions/cross.fish +++ config/fish/functions/cross.fish @@ -3,36 +3,47 @@ echo 'Usage: cross platform [architecture1] [architecture2]' return 1 end switch $argv[1] + case 3ds nds + if test -z "$DEVKITPRO" + echo 'Please set DEVKITPRO!' + end + if test -z "$DEVKITARM" + echo 'Please set DEVKITARM!' + end + + 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 + if test -z "$amiga_gcc_path" echo 'Please set amiga_gcc_path!' return 1 end set PATH $amiga_gcc_path/bin $PATH set -g cross_host m68k-amigaos case ppc - if test -z $adtools_path + if test -z "$adtools_path" echo 'Please set adtools_path!' return 1 end set PATH $adtools_path/bin $PATH set -g cross_host ppc-amigaos end - if test (count $argv) != 2 -o -z $cross_host + if test (count $argv) != 2 -o -z "$cross_host" echo 'Usage: cross amiga m68k|ppc' return 1 end case ios iossim if ! type -q xcrun @@ -78,11 +89,11 @@ set -g cross_host $archs[1]-apple-darwin case morphos set -l prefix (pkg_info -qp ppc-morphos-gcc-9 | awk '/^@cwd/ { print $2; exit }') - if test -z $prefix + if test -z "$prefix" echo 'Please install ppc-morphos-gcc-9 from pkgsrc!' return 1 end set PATH $prefix/gg/bin $PATH @@ -89,10 +100,34 @@ set -gx CC ppc-morphos-gcc-9 set -gx CXX ppc-morphos-g++-9 set -gx OBJC ppc-morphos-gcc-9 set -gx OBJCXX ppc-morphos-g++-9 set -g cross_host ppc-morphos + case switch + if test -z "$DEVKITPRO" + echo 'Please set DEVKITPRO!' + end + if test -z "$DEVKITA64" + echo 'Please set DEVKITA64!' + end + + set PATH $DEVKITA64/bin $PATH + set -g cross_host aarch64-none-elf + set -g objfw_configure_flags --with-switch + case wii wii-u + if test -z "$DEVKITPRO" + echo 'Please set DEVKITPRO!' + end + if test -z "$DEVKITPPC" + echo 'Please set DEVKITPPC!' + end + + set PATH $DEVKITPPC/bin $PATH + set -g cross_host powerpc-eabi + set -g objfw_configure_flags --with-$argv[1] case '*' echo "Unknown target: $argv[1]" return 1 end + + set -g objfw_configure_flags --host=$cross_host $objfw_configure_flags end