Merge branch 'develop-0071-android-r8b-mingw' of https://github.com/falcon4ever/openFrameworks into mergefalcon4

Conflicts:
	libs/openFrameworksCompiled/project/android/makefile
	libs/openFrameworksCompiled/project/makefileCommon/Makefile.android

Author: arturoc

libs/openFrameworksCompiled/project/android/makefile

@@ -33,7 +33,7 @@ endif
 ifeq ($(ARCH),android)
 	COMPILER_OPTIMIZATION = -Os
 	NDK_PLATFORM = android-8
-	GCC_VERSION = 4.6
+	GCC_VERSION = 4.4.3
 else
 ifeq ($(ARCH),armv7l)
 	COMPILER_OPTIMIZATION = -march=armv7-a -mtune=cortex-a8 -finline-functions -funroll-all-loops  -O3 -funsafe-math-optimizations -mfpu=neon -ftree-vectorize -mfloat-abi=softfp

libs/openFrameworksCompiled/project/makefileCommon/Makefile.android

@@ -151,7 +151,11 @@ AndroidInstall:
 	fi 
 	if [ -f obj/$(BIN_NAME) ]; then rm obj/$(BIN_NAME); fi
 	#touch AndroidManifest.xml
-	$(SDK_ROOT)/tools/android update project --target $(NDK_PLATFORM) --path $(PROJECT_PATH)
+	if [ "$(shell uname)" = "MINGW32_NT-6.1" ]; then \
+	cmd //c $(SDK_ROOT)/tools/android.bat update project --target $(NDK_PLATFORM) --path $(PROJECT_PATH); \
+	else \
+	$(SDK_ROOT)/tools/android update project --target $(NDK_PLATFORM) --path $(PROJECT_PATH); \
+	fi
 	if [ -d bin/classes ]; then rm -r bin/classes; fi
 	if [ -d bin/res ]; then rm -r bin/res; fi
 	if [ -f bin/classes.dex ]; then rm bin/classes.dex; fi
@@ -164,7 +168,11 @@ AndroidInstall:
 	if [ -f bin/$(APPNAME).apk ]; then rm bin/$(APPNAME).apk; fi
 	if [ -f bin/build.prop ]; then rm bin/build.prop; fi
 	if [ -f bin/jarlist.cache ]; then rm bin/jarlist.cache; fi
-	ant debug
+	if [ "$(shell uname)" = "MINGW32_NT-6.1" ]; then \
+	$(ANT_BIN)/ant debug; \
+	else \
+	ant debug; \
+	fi
 	cp bin/OFActivity-debug.apk bin/$(APPNAME).apk
 	#if [ "$(shell $(SDK_ROOT)/platform-tools/adb get-state)" = "device" ]; then
 	$(SDK_ROOT)/platform-tools/adb uninstall $(PKGNAME)

libs/openFrameworksCompiled/project/makefileCommon/Makefile.examples

@@ -29,6 +29,8 @@ ifeq ($(findstring Android,$(MAKECMDGOALS)),Android)
 	ARCH = android
 	ifeq ($(shell uname),Darwin)
 		HOST_PLATFORM = darwin-x86
+	else ifeq ($(shell uname),MINGW32_NT-6.1)
+		HOST_PLATFORM = windows
 	else
 		HOST_PLATFORM = linux-x86
 	endif