From 9eb4ef5197a628af2de6f55d6129e2e7c05335b6 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Sun, 28 Jun 2015 10:35:43 +0200
Subject: [PATCH] Unescape backslash chars in ?e and add osx-qt-mingw32
 toolchain support

---
 libr/core/cmd_help.c   |  3 ++-
 mk/i586-mingw32-gcc.mk | 21 +++++++++++++++++++++
 sys/mingw32.sh         |  6 ++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 mk/i586-mingw32-gcc.mk

diff --git a/libr/core/cmd_help.c b/libr/core/cmd_help.c
index 6e8c3e7dbd..882e750f46 100644
--- a/libr/core/cmd_help.c
+++ b/libr/core/cmd_help.c
@@ -370,8 +370,9 @@ static int cmd_help(void *data, const char *input) {
 	case 'e': // echo
 		{
 		const char *msg = r_str_chop_ro (input+1);
-		char *newmsg = filter_flags (core, msg);
 		// TODO: replace all ${flagname} by its value in hexa
+		char *newmsg = filter_flags (core, msg);
+		r_str_unescape (newmsg);
 		r_cons_printf ("%s\n", newmsg);
 		free (newmsg);
 		}
diff --git a/mk/i586-mingw32-gcc.mk b/mk/i586-mingw32-gcc.mk
new file mode 100644
index 0000000000..87a379e052
--- /dev/null
+++ b/mk/i586-mingw32-gcc.mk
@@ -0,0 +1,21 @@
+ifeq (${_INCLUDE_MK_GCC_},)
+_INCLUDE_MK_GCC_=1
+CC=i586-mingw32-gcc
+RANLIB=i586-mingw32-ranlib
+ONELIB=0
+OSTYPE=windows
+LINK=
+CC_AR=i586-mingw32-ar -r ${LIBAR}
+PICFLAGS=
+CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
+CC_LIB=${CC} -shared -o
+CFLAGS_INCLUDE=-I
+LDFLAGS+=-static-libgcc
+LDFLAGS_LINK=-l
+LDFLAGS_LINKPATH=-L
+CFLAGS_OPT0=-O0
+CFLAGS_OPT1=-O1
+CFLAGS_OPT2=-O2
+CFLAGS_OPT3=-O3
+CFLAGS_DEBUG=-g
+endif
diff --git a/sys/mingw32.sh b/sys/mingw32.sh
index fc539df647..c2fae5b334 100755
--- a/sys/mingw32.sh
+++ b/sys/mingw32.sh
@@ -11,6 +11,11 @@ unset LDFLAGS
 
 CFGFLAGS="--with-ostype=windows"
 
+type i586-mingw32-gcc
+if [ $? = 0 ]; then
+	C=i586-mingw32-gcc
+	H=i586-unknown-windows
+else
 type i686-pc-mingw32-gcc >/dev/null 2>&1
 if [ $? = 0 ]; then
 	C=i686-pc-mingw32-gcc
@@ -31,6 +36,7 @@ else
 	echo "arch/opensuse/ubuntu/debian mingw32 package required."
 	exit 1
 fi
+fi
 
 make mrproper