From 91effd3c16a9290fb4f926d2efc43b8a8cbb562c Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Mon, 24 Feb 2014 14:15:53 -0800
Subject: [PATCH] setting up for new ARM computer

---
 home/shrc.zsh   |  4 +++-
 sh/mw           | 28 +++++++++++++++++++---------
 ssh/known_hosts |  1 +
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/home/shrc.zsh b/home/shrc.zsh
index a4ed77e..5dbc79d 100644
--- a/home/shrc.zsh
+++ b/home/shrc.zsh
@@ -22,6 +22,9 @@ for x in AR CC CPP CXX CFLAGS CPPFLAGS CXXFLAGS LDFLAGS RANLIB RC WINDRES; do
     unset $x
 done
 
+# PuTTY over serial
+[[ "$TERM" == vt102 ]] && export TERM="xterm"
+
 export PREFIX="$HOME/opt/local"
 export CC="$(has clang || has gcc)"
 export CXX="$(has clang || has g++)"
@@ -69,6 +72,5 @@ alias unwrap='awk '\''BEGIN{RS="\n\n";FS="\n"}{for(i=1;i<=NF;i++)printf "%s ",$i
 alias picky='{ pacman -Qgq base base-devel | tee -; pacman -Qtnq; } | sort | uniq -u'
 alias unused='{ pacman -Qt; pacman -Qe | tee -; } | sort | uniq -u'
 
-#. ~/mingw.sh
 . ~/sh/lsf.sh/lsf.sh
 . ~/sh/z/z.sh
diff --git a/sh/mw b/sh/mw
index 45a2b6d..680f953 100755
--- a/sh/mw
+++ b/sh/mw
@@ -2,10 +2,15 @@
 mkdir -p ~/opt/mingw
 
 _mw_enabled=0
-_mw_host32=i686-w64-mingw32
-_mw_host64=x86_64-w64-mingw32
-#_mw_hostarm=arm-linux-gnueabi
-_mw_hostarm=armv7l-unknown-linux-gnueabihf # try saying that ten times fast
+_mw_host32=i686-w64-mingw32.static
+_mw_host64=x86_64-w64-mingw32.static
+
+if [[ "$(uname -m)" == armv7l ]]; then
+    _mw_hostarm=./
+else
+    _mw_hostarm=armv7l-unknown-linux-gnueabihf
+fi
+
 _mw_host=$_mw_host64
 
 typeset -Ag _mw_ # cryptic math expression errors if not global!
@@ -21,7 +26,8 @@ mw-disable() {
     _mw_enabled=0
 
     local e=
-    for e in PATH PREFIX CC CPP CXX LD CFLAGS CPPFLAGS CXXFLAGS LDFLAGS AR RANLIB RC WINDRES SDL_CFLAGS SDL_LDLIBS; do
+    for e in PATH PREFIX CC CPP CXX LD CFLAGS CPPFLAGS CXXFLAGS LDFLAGS \
+      AR RANLIB RC WINDRES OBJCOPY SDL_CFLAGS SDL_LDLIBS; do
         local v="${_mw_[$e]}"
         [ -n "$v" ] && export "$e=$v" || unset "$e"
     done
@@ -41,8 +47,12 @@ mw-enable() {
     local _mw_prefix=~/opt/$_mw_host
     mkdir -p "$_mw_prefix"
 
-    set -- CC gcc CXX g++ CPP cpp LD ld AR ar RANLIB ranlib RC windres WINDRES windres
-    while _mw_export "$1" "$_mw_bin/$_mw_host-$2"; do
+    local tmp="$_mw_bin/$_mw_host"
+    [ -d "$tmp" ] || tmp+='-'
+
+    set -- CC gcc CXX g++ CPP cpp LD ld AR ar \
+      RANLIB ranlib RC windres WINDRES windres OBJCOPY objcopy
+    while _mw_export "$1" "$tmp$2"; do
         shift 2
     done
 
@@ -67,11 +77,11 @@ mw-enable() {
 mw() {
     if [ "$#" -eq 1 ]; then
         if [[ "$1" == 32 ]]; then
-            mw-enable $_mw_host32 ~/src/mxe/usr
+            mw-enable $_mw_host32 /media/2tb/you/dump/mxe/usr
             export CFLAGS="-mwin32 $CFLAGS"
             export CXXFLAGS="$CFLAGS"
         elif [[ "$1" == 64 ]]; then
-            mw-enable $_mw_host64 ~/src/mxe/usr
+            mw-enable $_mw_host64 /media/2tb/you/dump/mxe/usr
             export CFLAGS="-mwin32 $CFLAGS"
             export CXXFLAGS="$CFLAGS"
         elif [[ "$1" == arm ]]; then
diff --git a/ssh/known_hosts b/ssh/known_hosts
index 61c50f7..f612788 100644
--- a/ssh/known_hosts
+++ b/ssh/known_hosts
@@ -6,3 +6,4 @@ localhost ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAA
 204.232.175.90 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
 192.168.2.110 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgldM58afMJR18VqItGTrEjR2xfkrikr9XF//u+6IFiZRsQc6qKvAfdAz8qil8JN5vVNTOIr0V/M0xtfxZc/n87Fwt2aJOIyLqDHfJYVeFfjnOzBB4VsuWNln3N/wdgJpzfr+gRbfz5lqc5cJ8rRznPc1QQHVsgfg3m77N5ux+3xv0dc=
 phantom,192.168.2.185 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDmoGFPzXsHCy37gNSkOn89Zc9MiZh6BnJEQnIbUfVD1dl2mv6IEEk7O6TEHRisK5mllQdWwo+auhI1/jHK6yq4J8HFFHlI7s/kacihWMM9+FuioLnVdBZk7Us4X4CTcfbDYuQ5Z9RgTr5YZKg7BD3qHQZRam/894mC0wolZUEnA1UenPE4HueYKmiWRWHswoRo2oYH326Z1/TKPxTCEnig6Br7cDGOGNogY+FzMRYUSdIx0gqNLZzmOBNZAzi40yHv/VE487IXX/mIB+YKarvsKQ3b/lzitEiWXNBI69wX18OTjjsLIrQVFhh7KKIYmn/GQVSqV4RZKHwrO8p/NRFr
+192.30.252.128 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==