Removed jni/Visual GDB Android build from legacy project files

8 files changed, 1 insertions, 895 deletions

diff --git a/Graphics/GraphicsEngineOpenGL/build/Win32/Android/gcc_Debug.h b/Graphics/GraphicsEngineOpenGL/build/Win32/Android/gcc_Debug.h
deleted file mode 100644
index b46f53e0..00000000
--- a/Graphics/GraphicsEngineOpenGL/build/Win32/Android/gcc_Debug.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-	This file is only used by IntelliSense (VisualStudio code suggestion system)
-	DO NOT INCLUDE THIS FILE FROM YOUR ACTUAL SOURCE FILES.
-	This file lists the preprocessor macros extracted from your GCC.
-	It is needed for IntelliSense to parse other header files correctly.
-*/
-#ifdef _MSC_VER
-#define _GNU_SOURCE 1
-#define __ANDROID__ 1
-#define __APCS_32__ 1
-#define __ARMEL__ 1
-#define __ARM_ARCH 7
-#define __ARM_ARCH_7A__ 1
-#define __ARM_ARCH_PROFILE A
-#define __ARM_EABI__ 1
-#define __ARM_PCS 1
-#define __ARM_VFPV3__ 1
-#define __ATOMIC_ACQUIRE 2
-#define __ATOMIC_ACQ_REL 4
-#define __ATOMIC_CONSUME 1
-#define __ATOMIC_RELAXED 0
-#define __ATOMIC_RELEASE 3
-#define __ATOMIC_SEQ_CST 5
-#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
-#define __CHAR16_TYPE__ unsigned short
-#define __CHAR32_TYPE__ unsigned int
-#define __CHAR_BIT__ 8
-#define __CHAR_UNSIGNED__ 1
-#define __CONSTANT_CFSTRINGS__ 1
-#define __DBL_DENORM_MIN__ 4.9406564584124654e-324
-#define __DBL_DIG__ 15
-#define __DBL_EPSILON__ 2.2204460492503131e-16
-#define __DBL_HAS_DENORM__ 1
-#define __DBL_HAS_INFINITY__ 1
-#define __DBL_HAS_QUIET_NAN__ 1
-#define __DBL_MANT_DIG__ 53
-#define __DBL_MAX_10_EXP__ 308
-#define __DBL_MAX_EXP__ 1024
-#define __DBL_MAX__ 1.7976931348623157e+308
-#define __DBL_MIN_10_EXP__ (-307)
-#define __DBL_MIN_EXP__ (-1021)
-#define __DBL_MIN__ 2.2250738585072014e-308
-#define __DECIMAL_DIG__ 17
-#define __DEPRECATED 1
-#define __ELF__ 1
-#define __EXCEPTIONS 1
-#define __FINITE_MATH_ONLY__ 0
-#define __FLT_DENORM_MIN__ 1.40129846e-45F
-#define __FLT_DIG__ 6
-#define __FLT_EPSILON__ 1.19209290e-7F
-#define __FLT_EVAL_METHOD__ 0
-#define __FLT_HAS_DENORM__ 1
-#define __FLT_HAS_INFINITY__ 1
-#define __FLT_HAS_QUIET_NAN__ 1
-#define __FLT_MANT_DIG__ 24
-#define __FLT_MAX_10_EXP__ 38
-#define __FLT_MAX_EXP__ 128
-#define __FLT_MAX__ 3.40282347e+38F
-#define __FLT_MIN_10_EXP__ (-37)
-#define __FLT_MIN_EXP__ (-125)
-#define __FLT_MIN__ 1.17549435e-38F
-#define __FLT_RADIX__ 2
-#define __GCC_ATOMIC_BOOL_LOCK_FREE 2
-#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2
-#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2
-#define __GCC_ATOMIC_CHAR_LOCK_FREE 2
-#define __GCC_ATOMIC_INT_LOCK_FREE 2
-#define __GCC_ATOMIC_LLONG_LOCK_FREE 2
-#define __GCC_ATOMIC_LONG_LOCK_FREE 2
-#define __GCC_ATOMIC_POINTER_LOCK_FREE 2
-#define __GCC_ATOMIC_SHORT_LOCK_FREE 2
-#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1
-#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2
-#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
-#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
-#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
-#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
-#define __GNUC_GNU_INLINE__ 1
-#define __GNUC_MINOR__ 2
-#define __GNUC_PATCHLEVEL__ 1
-#define __GNUC__ 4
-#define __GNUG__ 4
-#define __GXX_ABI_VERSION 1002
-#define __GXX_EXPERIMENTAL_CXX0X__ 1
-#define __GXX_RTTI 1
-#define __GXX_WEAK__ 1
-#define __INT16_TYPE__ short
-#define __INT32_TYPE__ int
-#define __INT64_C_SUFFIX__ LL
-#define __INT64_TYPE__ long long int
-#define __INT8_TYPE__ char
-#define __INTMAX_MAX__ 9223372036854775807LL
-#define __INTMAX_TYPE__ long long int
-#define __INTMAX_WIDTH__ 64
-#define __INTPTR_TYPE__ long int
-#define __INTPTR_WIDTH__ 32
-#define __INT_MAX__ 2147483647
-#define __LDBL_DENORM_MIN__ 4.9406564584124654e-324L
-#define __LDBL_DIG__ 15
-#define __LDBL_EPSILON__ 2.2204460492503131e-16L
-#define __LDBL_HAS_DENORM__ 1
-#define __LDBL_HAS_INFINITY__ 1
-#define __LDBL_HAS_QUIET_NAN__ 1
-#define __LDBL_MANT_DIG__ 53
-#define __LDBL_MAX_10_EXP__ 308
-#define __LDBL_MAX_EXP__ 1024
-#define __LDBL_MAX__ 1.7976931348623157e+308L
-#define __LDBL_MIN_10_EXP__ (-307)
-#define __LDBL_MIN_EXP__ (-1021)
-#define __LDBL_MIN__ 2.2250738585072014e-308L
-#define __LITTLE_ENDIAN__ 1
-#define __LONG_LONG_MAX__ 9223372036854775807LL
-#define __LONG_MAX__ 2147483647L
-#define __NO_INLINE__ 1
-#define __ORDER_BIG_ENDIAN__ 4321
-#define __ORDER_LITTLE_ENDIAN__ 1234
-#define __ORDER_PDP_ENDIAN__ 3412
-#define __PIC__ 1
-#define __POINTER_WIDTH__ 32
-#define __PRAGMA_REDEFINE_EXTNAME 1
-#define __PTRDIFF_TYPE__ int
-#define __PTRDIFF_WIDTH__ 32
-#define __REGISTER_PREFIX__ 
-#define __SCHAR_MAX__ 127
-#define __SHRT_MAX__ 32767
-#define __SIG_ATOMIC_WIDTH__ 32
-#define __SIZEOF_DOUBLE__ 8
-#define __SIZEOF_FLOAT__ 4
-#define __SIZEOF_INT__ 4
-#define __SIZEOF_LONG_DOUBLE__ 8
-#define __SIZEOF_LONG_LONG__ 8
-#define __SIZEOF_LONG__ 4
-#define __SIZEOF_POINTER__ 4
-#define __SIZEOF_PTRDIFF_T__ 4
-#define __SIZEOF_SHORT__ 2
-#define __SIZEOF_SIZE_T__ 4
-#define __SIZEOF_WCHAR_T__ 4
-#define __SIZEOF_WINT_T__ 4
-#define __SIZE_MAX__ 4294967295U
-#define __SIZE_TYPE__ unsigned int
-#define __SIZE_WIDTH__ 32
-#define __SSP__ 1
-#define __STDC_HOSTED__ 1
-#define __STDC_UTF_16__ 1
-#define __STDC_UTF_32__ 1
-#define __STDC__ 1
-#define __STRICT_ANSI__ 1
-#define __THUMB_INTERWORK__ 1
-#define __UINTMAX_TYPE__ long long unsigned int
-#define __USER_LABEL_PREFIX__ 
-#define __VERSION__ "4.2.1 Compatible Clang 3.4 (https://bitbucket.org/loganchien/clang c34bb12af3af42f671296cdb978b34b931062d2a) (https://bitbucket.org/loganchien/llvm d09f2eff406d17c86d51db7660bd374cf092e6ed)"
-#define __VFP_FP__ 1
-#define __WCHAR_MAX__ 4294967295U
-#define __WCHAR_TYPE__ unsigned int
-#define __WCHAR_UNSIGNED__ 1
-#define __WCHAR_WIDTH__ 32
-#define __WINT_TYPE__ unsigned int
-#define __WINT_UNSIGNED__ 1
-#define __WINT_WIDTH__ 32
-#define __arm 1
-#define __arm__ 1
-#define __clang__ 1
-#define __clang_major__ 3
-#define __clang_minor__ 4
-#define __clang_patchlevel__ 0
-#define __clang_version__ "3.4 (https://bitbucket.org/loganchien/clang c34bb12af3af42f671296cdb978b34b931062d2a) (https://bitbucket.org/loganchien/llvm d09f2eff406d17c86d51db7660bd374cf092e6ed)"
-#define __cplusplus 201103L
-#define __cpp_attributes 200809
-#define __cpp_constexpr 200704
-#define __cpp_decltype 200707
-#define __cpp_lambdas 200907
-#define __cpp_raw_strings 200710
-#define __cpp_rvalue_references 200610
-#define __cpp_static_assert 200410
-#define __cpp_unicode_characters 200704
-#define __cpp_unicode_literals 200710
-#define __cpp_user_defined_literals 200809
-#define __cpp_variadic_templates 200704
-#define __gnu_linux__ 1
-#define __linux 1
-#define __linux__ 1
-#define __llvm__ 1
-#define __pic__ 1
-#define __private_extern__ extern
-#define __unix 1
-#define __unix__ 1
-#define ANDROID 
-#endif
-
-// --- Include directories begin --- //
-//C:/Android/ndk/platforms/android-3/arch-arm/usr/include
-//C:/Users/eayusov/Documents/Sandbox/Common/Android/jni/../../include
-//C:\Android\ndk\toolchains\llvm-3.4\prebuilt\windows\bin\..\lib\clang\3.4\include
-// --- Library directories end --- //
-
-
-// --- Library directories begin --- //
-// --- Library directories begin --- //
-
diff --git a/Graphics/GraphicsEngineOpenGL/build/Win32/Android/gcc_Release.h b/Graphics/GraphicsEngineOpenGL/build/Win32/Android/gcc_Release.h
deleted file mode 100644
index 6ca2abab..00000000
--- a/Graphics/GraphicsEngineOpenGL/build/Win32/Android/gcc_Release.h
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
-	This file is only used by IntelliSense (VisualStudio code suggestion system)
-	DO NOT INCLUDE THIS FILE FROM YOUR ACTUAL SOURCE FILES.
-	This file lists the preprocessor macros extracted from your GCC.
-	It is needed for IntelliSense to parse other header files correctly.
-*/
-#ifdef _MSC_VER
-#define __DBL_MIN_EXP__ (-1021)
-#define __HQ_FBIT__ 15
-#define __UINT_LEAST16_MAX__ 65535
-#define __ARM_SIZEOF_WCHAR_T 32
-#define __ATOMIC_ACQUIRE 2
-#define __SFRACT_IBIT__ 0
-#define __FLT_MIN__ 1.1754943508222875e-38F
-#define __UFRACT_MAX__ 0XFFFFP-16UR
-#define __UINT_LEAST8_TYPE__ unsigned char
-#define __DQ_FBIT__ 63
-#define __ARM_FEATURE_SAT 1
-#define __ULFRACT_FBIT__ 32
-#define __SACCUM_EPSILON__ 0x1P-7HK
-#define __CHAR_BIT__ 8
-#define __USQ_IBIT__ 0
-#define __UINT8_MAX__ 255
-#define __ACCUM_FBIT__ 15
-#define __ANDROID__ 1
-#define __WINT_MAX__ 4294967295U
-#define __USFRACT_FBIT__ 8
-#define __ORDER_LITTLE_ENDIAN__ 1234
-#define __SIZE_MAX__ 4294967295U
-#define __ARM_ARCH_ISA_ARM 1
-#define __WCHAR_MAX__ 4294967295U
-#define __LACCUM_IBIT__ 32
-#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
-#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
-#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
-#define __DBL_DENORM_MIN__ double(4.9406564584124654e-324L)
-#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
-#define __GCC_ATOMIC_CHAR_LOCK_FREE 2
-#define __FLT_EVAL_METHOD__ 0
-#define __unix__ 1
-#define __LLACCUM_MAX__ 0X7FFFFFFFFFFFFFFFP-31LLK
-#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2
-#define __FRACT_FBIT__ 15
-#define __UINT_FAST64_MAX__ 18446744073709551615ULL
-#define __SIG_ATOMIC_TYPE__ int
-#define __UACCUM_FBIT__ 16
-#define __DBL_MIN_10_EXP__ (-307)
-#define __FINITE_MATH_ONLY__ 0
-#define __ARMEL__ 1
-#define __ARM_FEATURE_UNALIGNED 1
-#define __LFRACT_IBIT__ 0
-#define __GNUC_PATCHLEVEL__ 0
-#define __LFRACT_MAX__ 0X7FFFFFFFP-31LR
-#define __UINT_FAST8_MAX__ 255
-#define __DEC64_MAX_EXP__ 385
-#define __UINT_LEAST64_MAX__ 18446744073709551615ULL
-#define __SA_FBIT__ 15
-#define __SHRT_MAX__ 32767
-#define __LDBL_MAX__ 1.7976931348623157e+308L
-#define __FRACT_MAX__ 0X7FFFP-15R
-#define __UFRACT_FBIT__ 16
-#define __ARM_FP 12
-#define __UFRACT_MIN__ 0.0UR
-#define __UINT_LEAST8_MAX__ 255
-#define __GCC_ATOMIC_BOOL_LOCK_FREE 2
-#define __UINTMAX_TYPE__ long long unsigned int
-#define __LLFRACT_EPSILON__ 0x1P-63LLR
-#define __linux 1
-#define __DEC32_EPSILON__ 1E-6DF
-#define __CHAR_UNSIGNED__ 1
-#define __UINT32_MAX__ 4294967295U
-#define __GXX_EXPERIMENTAL_CXX0X__ 1
-#define __ULFRACT_MAX__ 0XFFFFFFFFP-32ULR
-#define __TA_IBIT__ 64
-#define __LDBL_MAX_EXP__ 1024
-#define __WINT_MIN__ 0U
-#define __linux__ 1
-#define __ULLFRACT_MIN__ 0.0ULLR
-#define __SCHAR_MAX__ 127
-#define __WCHAR_MIN__ 0U
-#define __DBL_DIG__ 15
-#define __GCC_ATOMIC_POINTER_LOCK_FREE 2
-#define __LLACCUM_MIN__ (-0X1P31LLK-0X1P31LLK)
-#define __SIZEOF_INT__ 4
-#define __SIZEOF_POINTER__ 4
-#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2
-#define __USACCUM_IBIT__ 8
-#define __USER_LABEL_PREFIX__ 
-#define __STDC_HOSTED__ 1
-#define __LDBL_HAS_INFINITY__ 1
-#define __LFRACT_MIN__ (-0.5LR-0.5LR)
-#define __HA_IBIT__ 8
-#define __ARM_NEON_FP 4
-#define __TQ_IBIT__ 0
-#define __FLT_EPSILON__ 1.1920928955078125e-7F
-#define __APCS_32__ 1
-#define __GXX_WEAK__ 1
-#define __USFRACT_IBIT__ 0
-#define __LDBL_MIN__ 2.2250738585072014e-308L
-#define __FRACT_MIN__ (-0.5R-0.5R)
-#define __DEC32_MAX__ 9.999999E96DF
-#define __DA_IBIT__ 32
-#define __ARM_SIZEOF_MINIMAL_ENUM 4
-#define __INT32_MAX__ 2147483647
-#define __UQQ_FBIT__ 8
-#define __SIZEOF_LONG__ 4
-#define __UACCUM_MAX__ 0XFFFFFFFFP-16UK
-#define __DECIMAL_DIG__ 17
-#define __LFRACT_EPSILON__ 0x1P-31LR
-#define __ULFRACT_MIN__ 0.0ULR
-#define __LDBL_HAS_QUIET_NAN__ 1
-#define __ULACCUM_IBIT__ 32
-#define __UACCUM_EPSILON__ 0x1P-16UK
-#define __GNUC__ 4
-#define __ULLACCUM_MAX__ 0XFFFFFFFFFFFFFFFFP-32ULLK
-#define __GXX_RTTI 1
-#define __HQ_IBIT__ 0
-#define __FLT_HAS_DENORM__ 1
-#define __SIZEOF_LONG_DOUBLE__ 8
-#define __BIGGEST_ALIGNMENT__ 8
-#define __GNUC_STDC_INLINE__ 1
-#define __DQ_IBIT__ 0
-#define __DBL_MAX__ double(1.7976931348623157e+308L)
-#define __ULFRACT_IBIT__ 0
-#define __INT_FAST32_MAX__ 2147483647
-#define __DBL_HAS_INFINITY__ 1
-#define __INT64_MAX__ 9223372036854775807LL
-#define __ACCUM_IBIT__ 16
-#define __DEC32_MIN_EXP__ (-94)
-#define __THUMB_INTERWORK__ 1
-#define __LACCUM_MAX__ 0X7FFFFFFFFFFFFFFFP-31LK
-#define __INT_FAST16_TYPE__ int
-#define __STRICT_ANSI__ 1
-#define __LDBL_HAS_DENORM__ 1
-#define __ARM_FEATURE_LDREX 15
-#define __cplusplus 201103L
-#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL
-#define __INT_LEAST32_MAX__ 2147483647
-#define __ARM_PCS 1
-#define __DEC32_MIN__ 1E-95DF
-#define __ACCUM_MAX__ 0X7FFFFFFFP-15K
-#define __DEPRECATED 1
-#define __DBL_MAX_EXP__ 1024
-#define __USACCUM_EPSILON__ 0x1P-8UHK
-#define __DEC128_EPSILON__ 1E-33DL
-#define __SFRACT_MAX__ 0X7FP-7HR
-#define __FRACT_IBIT__ 0
-#define __PTRDIFF_MAX__ 2147483647
-#define __UACCUM_MIN__ 0.0UK
-#define __UACCUM_IBIT__ 16
-#define __GNUG__ 4
-#define __LONG_LONG_MAX__ 9223372036854775807LL
-#define __SIZEOF_SIZE_T__ 4
-#define __ULACCUM_MAX__ 0XFFFFFFFFFFFFFFFFP-32ULK
-#define __SIZEOF_WINT_T__ 4
-#define __SA_IBIT__ 16
-#define __ULLACCUM_MIN__ 0.0ULLK
-#define __GXX_ABI_VERSION 1002
-#define __UTA_FBIT__ 64
-#define __FLT_MIN_EXP__ (-125)
-#define __USFRACT_MAX__ 0XFFP-8UHR
-#define __UFRACT_IBIT__ 0
-#define __ARM_FEATURE_QBIT 1
-#define __INT_FAST64_TYPE__ long long int
-#define __DBL_MIN__ double(2.2250738585072014e-308L)
-#define __FLT_MIN_10_EXP__ (-37)
-#define __LACCUM_MIN__ (-0X1P31LK-0X1P31LK)
-#define __ULLACCUM_FBIT__ 32
-#define __GXX_TYPEINFO_EQUALITY_INLINE 0
-#define __ULLFRACT_EPSILON__ 0x1P-64ULLR
-#define __DEC128_MIN__ 1E-6143DL
-#define __REGISTER_PREFIX__ 
-#define __UINT16_MAX__ 65535
-#define __DBL_HAS_DENORM__ 1
-#define __ACCUM_MIN__ (-0X1P15K-0X1P15K)
-#define __SQ_IBIT__ 0
-#define __UINT8_TYPE__ unsigned char
-#define __UHA_FBIT__ 8
-#define __NO_INLINE__ 1
-#define __SFRACT_MIN__ (-0.5HR-0.5HR)
-#define __UTQ_FBIT__ 128
-#define __FLT_MANT_DIG__ 24
-#define __VERSION__ "4.8"
-#define __ULLFRACT_FBIT__ 64
-#define __FRACT_EPSILON__ 0x1P-15R
-#define __ULACCUM_MIN__ 0.0ULK
-#define __UDA_FBIT__ 32
-#define __LLACCUM_EPSILON__ 0x1P-31LLK
-#define __GCC_ATOMIC_INT_LOCK_FREE 2
-#define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__
-#define __USFRACT_MIN__ 0.0UHR
-#define __ULLACCUM_IBIT__ 32
-#define __UQQ_IBIT__ 0
-#define __DEC64_EPSILON__ 1E-15DD
-#define __ORDER_PDP_ENDIAN__ 3412
-#define __DEC128_MIN_EXP__ (-6142)
-#define __UHQ_FBIT__ 16
-#define __LLACCUM_FBIT__ 31
-#define __INT_FAST32_TYPE__ int
-#define __UINT_LEAST16_TYPE__ short unsigned int
-#define __INT16_MAX__ 32767
-#define __SIZE_TYPE__ unsigned int
-#define __UINT64_MAX__ 18446744073709551615ULL
-#define __UDQ_FBIT__ 64
-#define __INT8_TYPE__ signed char
-#define __ELF__ 1
-#define __ULFRACT_EPSILON__ 0x1P-32ULR
-#define __LLFRACT_FBIT__ 63
-#define __FLT_RADIX__ 2
-#define __INT_LEAST16_TYPE__ short int
-#define __ARM_ARCH_PROFILE 65
-#define __LDBL_EPSILON__ 2.2204460492503131e-16L
-#define __SACCUM_MAX__ 0X7FFFP-7HK
-#define __SIG_ATOMIC_MAX__ 2147483647
-#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2
-#define __VFP_FP__ 1
-#define __SIZEOF_PTRDIFF_T__ 4
-#define __LACCUM_EPSILON__ 0x1P-31LK
-#define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF
-#define __INT_FAST16_MAX__ 2147483647
-#define __UINT_FAST32_MAX__ 4294967295U
-#define __UINT_LEAST64_TYPE__ long long unsigned int
-#define __USACCUM_MAX__ 0XFFFFP-8UHK
-#define __SFRACT_EPSILON__ 0x1P-7HR
-#define __FLT_HAS_QUIET_NAN__ 1
-#define __FLT_MAX_10_EXP__ 38
-#define __LONG_MAX__ 2147483647L
-#define __DEC128_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143DL
-#define __FLT_HAS_INFINITY__ 1
-#define __unix 1
-#define __USA_FBIT__ 16
-#define __UINT_FAST16_TYPE__ unsigned int
-#define __DEC64_MAX__ 9.999999999999999E384DD
-#define __CHAR16_TYPE__ short unsigned int
-#define __PRAGMA_REDEFINE_EXTNAME 1
-#define __INT_LEAST16_MAX__ 32767
-#define __DEC64_MANT_DIG__ 16
-#define __UINT_LEAST32_MAX__ 4294967295U
-#define __SACCUM_FBIT__ 7
-#define __GCC_ATOMIC_LONG_LOCK_FREE 2
-#define __INT_LEAST64_TYPE__ long long int
-#define __ARM_FEATURE_CLZ 1
-#define __INT16_TYPE__ short int
-#define __INT_LEAST8_TYPE__ signed char
-#define __SQ_FBIT__ 31
-#define __DEC32_MAX_EXP__ 97
-#define __ARM_ARCH_ISA_THUMB 2
-#define __INT_FAST8_MAX__ 127
-#define __ARM_ARCH 7
-#define __INTPTR_MAX__ 2147483647
-#define __QQ_FBIT__ 7
-#define __UTA_IBIT__ 64
-#define __EXCEPTIONS 1
-#define __LDBL_MANT_DIG__ 53
-#define __SFRACT_FBIT__ 7
-#define __SACCUM_MIN__ (-0X1P7HK-0X1P7HK)
-#define __DBL_HAS_QUIET_NAN__ 1
-#define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1)
-#define __INTPTR_TYPE__ int
-#define __UINT16_TYPE__ short unsigned int
-#define __WCHAR_TYPE__ unsigned int
-#define __SIZEOF_FLOAT__ 4
-#define __USQ_FBIT__ 32
-#define __pic__ 1
-#define __UINTPTR_MAX__ 4294967295U
-#define __DEC64_MIN_EXP__ (-382)
-#define __INT_FAST64_MAX__ 9223372036854775807LL
-#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1
-#define __FLT_DIG__ 6
-#define __UINT_FAST64_TYPE__ long long unsigned int
-#define __INT_MAX__ 2147483647
-#define __LACCUM_FBIT__ 31
-#define __USACCUM_MIN__ 0.0UHK
-#define __UHA_IBIT__ 8
-#define __INT64_TYPE__ long long int
-#define __FLT_MAX_EXP__ 128
-#define __UTQ_IBIT__ 0
-#define __DBL_MANT_DIG__ 53
-#define __INT_LEAST64_MAX__ 9223372036854775807LL
-#define __DEC64_MIN__ 1E-383DD
-#define __WINT_TYPE__ unsigned int
-#define __UINT_LEAST32_TYPE__ unsigned int
-#define __SIZEOF_SHORT__ 2
-#define __ULLFRACT_IBIT__ 0
-#define __LDBL_MIN_EXP__ (-1021)
-#define __arm__ 1
-#define __UDA_IBIT__ 32
-#define __INT_LEAST8_MAX__ 127
-#define __SSP__ 1
-#define __LFRACT_FBIT__ 31
-#define __WCHAR_UNSIGNED__ 1
-#define __ARM_ARCH_7A__ 1
-#define __LDBL_MAX_10_EXP__ 308
-#define __ATOMIC_RELAXED 0
-#define __DBL_EPSILON__ double(2.2204460492503131e-16L)
-#define __ARM_FEATURE_SIMD32 1
-#define __INT_LEAST32_TYPE__ int
-#define __SIZEOF_WCHAR_T__ 4
-#define __UINT64_TYPE__ long long unsigned int
-#define __LLFRACT_MAX__ 0X7FFFFFFFFFFFFFFFP-63LLR
-#define __TQ_FBIT__ 127
-#define __INT_FAST8_TYPE__ signed char
-#define __ULLACCUM_EPSILON__ 0x1P-32ULLK
-#define __UHQ_IBIT__ 0
-#define __LLACCUM_IBIT__ 32
-#define __DBL_DECIMAL_DIG__ 17
-#define __DEC_EVAL_METHOD__ 2
-#define __TA_FBIT__ 63
-#define __UDQ_IBIT__ 0
-#define __ORDER_BIG_ENDIAN__ 4321
-#define __ACCUM_EPSILON__ 0x1P-15K
-#define __INTMAX_MAX__ 9223372036854775807LL
-#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
-#define __FLT_DENORM_MIN__ 1.4012984643248171e-45F
-#define __LLFRACT_IBIT__ 0
-#define __INT8_MAX__ 127
-#define __PIC__ 1
-#define __UINT_FAST32_TYPE__ unsigned int
-#define __CHAR32_TYPE__ unsigned int
-#define __FLT_MAX__ 3.4028234663852886e+38F
-#define __USACCUM_FBIT__ 8
-#define __INT32_TYPE__ int
-#define __SIZEOF_DOUBLE__ 8
-#define __UFRACT_EPSILON__ 0x1P-16UR
-#define __INTMAX_TYPE__ long long int
-#define __DEC128_MAX_EXP__ 6145
-#define __ATOMIC_CONSUME 1
-#define __GNUC_MINOR__ 8
-#define __UINTMAX_MAX__ 18446744073709551615ULL
-#define __DEC32_MANT_DIG__ 7
-#define __HA_FBIT__ 7
-#define __DBL_MAX_10_EXP__ 308
-#define __LDBL_DENORM_MIN__ 4.9406564584124654e-324L
-#define __STDC__ 1
-#define __PTRDIFF_TYPE__ int
-#define __LLFRACT_MIN__ (-0.5LLR-0.5LLR)
-#define __ATOMIC_SEQ_CST 5
-#define __DA_FBIT__ 31
-#define __UINT32_TYPE__ unsigned int
-#define __UINTPTR_TYPE__ unsigned int
-#define __USA_IBIT__ 16
-#define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD
-#define __ARM_EABI__ 1
-#define __DEC128_MANT_DIG__ 34
-#define __LDBL_MIN_10_EXP__ (-307)
-#define __SIZEOF_LONG_LONG__ 8
-#define __ULACCUM_EPSILON__ 0x1P-32ULK
-#define __SACCUM_IBIT__ 8
-#define __GCC_ATOMIC_LLONG_LOCK_FREE 2
-#define __LDBL_DIG__ 15
-#define __FLT_DECIMAL_DIG__ 9
-#define __UINT_FAST16_MAX__ 4294967295U
-#define __GCC_ATOMIC_SHORT_LOCK_FREE 2
-#define __ULLFRACT_MAX__ 0XFFFFFFFFFFFFFFFFP-64ULLR
-#define __UINT_FAST8_TYPE__ unsigned char
-#define _GNU_SOURCE 1
-#define __USFRACT_EPSILON__ 0x1P-8UHR
-#define __ULACCUM_FBIT__ 32
-#define __ARM_FEATURE_DSP 1
-#define __QQ_IBIT__ 0
-#define __ATOMIC_ACQ_REL 4
-#define __ATOMIC_RELEASE 3
-#define ANDROID 
-#endif
-
-// --- Include directories begin --- //
-//C:/Android/ndk/platforms/android-3/arch-arm/usr/include
-//C:\Android\ndk\toolchains\arm-linux-androideabi-4.8\prebuilt\windows\bin\../lib/gcc/arm-linux-androideabi/4.8/include
-//C:\Android\ndk\toolchains\arm-linux-androideabi-4.8\prebuilt\windows\bin\../lib/gcc/arm-linux-androideabi/4.8/include-fixed
-// --- Library directories end --- //
-
-
-// --- Library directories begin --- //
-//C:/Android/ndk/toolchains/arm-linux-androideabi-4.8/prebuilt/windows/bin/../lib/gcc/arm-linux-androideabi/4.8/armv7-a/
-//C:/Android/ndk/toolchains/arm-linux-androideabi-4.8/prebuilt/windows/bin/../lib/gcc/arm-linux-androideabi/4.8/../../../../arm-linux-androideabi/lib/armv7-a/
-//C:/Android/ndk/toolchains/arm-linux-androideabi-4.8/prebuilt/windows/bin/../lib/gcc/arm-linux-androideabi/4.8/
-//C:/Android/ndk/toolchains/arm-linux-androideabi-4.8/prebuilt/windows/bin/../lib/gcc/
-//C:/Android/ndk/toolchains/arm-linux-androideabi-4.8/prebuilt/windows/bin/../lib/gcc/arm-linux-androideabi/4.8/../../../../arm-linux-androideabi/lib/
-// --- Library directories begin --- //
-
diff --git a/Graphics/GraphicsEngineOpenGL/build/Win32/GraphicsEngineOpenGL-Debug.vgdbsettings b/Graphics/GraphicsEngineOpenGL/build/Win32/GraphicsEngineOpenGL-Debug.vgdbsettings
deleted file mode 100644
index 3f5b24b1..00000000
--- a/Graphics/GraphicsEngineOpenGL/build/Win32/GraphicsEngineOpenGL-Debug.vgdbsettings
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <ConfigurationName>Debug</ConfigurationName>
-  <Project xsi:type="com.visualgdb.project.android">
-    <CustomSourceDirectories>
-      <Directories />
-      <PathStyle>MinGWWindowsSlash</PathStyle>
-    </CustomSourceDirectories>
-    <AndroidProjectPath>$(ProjectDir)</AndroidProjectPath>
-  </Project>
-  <Build xsi:type="com.visualgdb.build.android">
-    <AndroidPlatform>android-19</AndroidPlatform>
-    <IsDebugConfiguration>true</IsDebugConfiguration>
-    <JNIOnlyBuild>true</JNIOnlyBuild>
-    <AdditionalDirectoriesToDeleteOnClean>bin;obj</AdditionalDirectoriesToDeleteOnClean>
-    <DeleteANTFilesOnClean>false</DeleteANTFilesOnClean>
-    <DoNotEditAndroidManifest>false</DoNotEditAndroidManifest>
-    <CustomActions />
-  </Build>
-  <Debug xsi:type="com.visualgdb.debug.android">
-    <AdditionalStartupCommands />
-    <AdditionalGDBSettings>
-      <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
-      <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
-      <PendingBreakpointsSupported>true</PendingBreakpointsSupported>
-      <DisableChildRanges>false</DisableChildRanges>
-      <UseAppleExtensions>false</UseAppleExtensions>
-      <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
-      <MakeLogFile>false</MakeLogFile>
-      <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
-      <UseRelativePathsOnly>false</UseRelativePathsOnly>
-      <ExitAction>KillApp</ExitAction>
-      <Features>
-        <DisableAutoDetection>false</DisableAutoDetection>
-        <UseFrameParameter>false</UseFrameParameter>
-        <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
-        <ListLocalsSupported>false</ListLocalsSupported>
-        <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
-        <ThreadInfoSupported>false</ThreadInfoSupported>
-        <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
-        <SupportTargetCommand>false</SupportTargetCommand>
-      </Features>
-      <DisableDisassembly>false</DisableDisassembly>
-      <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
-      <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
-      <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
-    </AdditionalGDBSettings>
-    <LaunchGDBSettings xsi:type="GDBLaunchParametersAndroid" />
-    <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
-    <UseDefaultInstallDir>false</UseDefaultInstallDir>
-    <RemotePort>5039</RemotePort>
-    <LocalPort>5039</LocalPort>
-    <GDBServerStartupTimeout>10000</GDBServerStartupTimeout>
-    <AdditionalGDBServerStartupDelay>0</AdditionalGDBServerStartupDelay>
-    <DoubleSlashWorkaround>false</DoubleSlashWorkaround>
-    <AlreadyRunningDecision>Ask</AlreadyRunningDecision>
-    <ShowLogCat>true</ShowLogCat>
-    <EnableThreadNameWatcher>true</EnableThreadNameWatcher>
-  </Debug>
-  <CustomBuild>
-    <PreBuildActions />
-    <PostBuildActions />
-    <PreCleanActions />
-    <PostCleanActions />
-  </CustomBuild>
-  <CustomDebug>
-    <PreDebugActions />
-    <PostDebugActions />
-    <BreakMode>Default</BreakMode>
-  </CustomDebug>
-  <CustomShortcuts>
-    <Shortcuts />
-    <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
-  </CustomShortcuts>
-  <UserDefinedVariables />
-</VisualGDBProjectSettings2>
\ No newline at end of file
diff --git a/Graphics/GraphicsEngineOpenGL/build/Win32/GraphicsEngineOpenGL-Release.vgdbsettings b/Graphics/GraphicsEngineOpenGL/build/Win32/GraphicsEngineOpenGL-Release.vgdbsettings
deleted file mode 100644
index 669691f2..00000000
--- a/Graphics/GraphicsEngineOpenGL/build/Win32/GraphicsEngineOpenGL-Release.vgdbsettings
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <ConfigurationName>Release</ConfigurationName>
-  <Project xsi:type="com.visualgdb.project.android">
-    <CustomSourceDirectories>
-      <Directories />
-      <PathStyle>MinGWWindowsSlash</PathStyle>
-    </CustomSourceDirectories>
-    <AndroidProjectPath>$(ProjectDir)</AndroidProjectPath>
-  </Project>
-  <Build xsi:type="com.visualgdb.build.android">
-    <AndroidPlatform>android-19</AndroidPlatform>
-    <IsDebugConfiguration>false</IsDebugConfiguration>
-    <JNIOnlyBuild>true</JNIOnlyBuild>
-    <AdditionalDirectoriesToDeleteOnClean>bin;obj</AdditionalDirectoriesToDeleteOnClean>
-    <DeleteANTFilesOnClean>false</DeleteANTFilesOnClean>
-    <DoNotEditAndroidManifest>false</DoNotEditAndroidManifest>
-    <CustomActions />
-  </Build>
-  <Debug xsi:type="com.visualgdb.debug.android">
-    <AdditionalStartupCommands />
-    <AdditionalGDBSettings>
-      <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
-      <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
-      <PendingBreakpointsSupported>true</PendingBreakpointsSupported>
-      <DisableChildRanges>false</DisableChildRanges>
-      <UseAppleExtensions>false</UseAppleExtensions>
-      <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
-      <MakeLogFile>false</MakeLogFile>
-      <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
-      <UseRelativePathsOnly>false</UseRelativePathsOnly>
-      <ExitAction>KillApp</ExitAction>
-      <Features>
-        <DisableAutoDetection>false</DisableAutoDetection>
-        <UseFrameParameter>false</UseFrameParameter>
-        <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
-        <ListLocalsSupported>false</ListLocalsSupported>
-        <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
-        <ThreadInfoSupported>false</ThreadInfoSupported>
-        <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
-        <SupportTargetCommand>false</SupportTargetCommand>
-      </Features>
-      <DisableDisassembly>false</DisableDisassembly>
-      <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
-      <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
-      <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
-    </AdditionalGDBSettings>
-    <LaunchGDBSettings xsi:type="GDBLaunchParametersAndroid" />
-    <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
-    <UseDefaultInstallDir>false</UseDefaultInstallDir>
-    <RemotePort>5039</RemotePort>
-    <LocalPort>5039</LocalPort>
-    <GDBServerStartupTimeout>10000</GDBServerStartupTimeout>
-    <AdditionalGDBServerStartupDelay>0</AdditionalGDBServerStartupDelay>
-    <DoubleSlashWorkaround>false</DoubleSlashWorkaround>
-    <AlreadyRunningDecision>Ask</AlreadyRunningDecision>
-    <ShowLogCat>true</ShowLogCat>
-    <EnableThreadNameWatcher>true</EnableThreadNameWatcher>
-  </Debug>
-  <CustomBuild>
-    <PreBuildActions />
-    <PostBuildActions />
-    <PreCleanActions />
-    <PostCleanActions />
-  </CustomBuild>
-  <CustomDebug>
-    <PreDebugActions />
-    <PostDebugActions />
-    <BreakMode>Default</BreakMode>
-  </CustomDebug>
-  <CustomShortcuts>
-    <Shortcuts />
-    <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
-  </CustomShortcuts>
-  <UserDefinedVariables />
-</VisualGDBProjectSettings2>
\ No newline at end of file
diff --git a/Graphics/GraphicsEngineOpenGL/build/Win32/GraphicsEngineOpenGL.vcxproj b/Graphics/GraphicsEngineOpenGL/build/Win32/GraphicsEngineOpenGL.vcxproj
index 3976dab7..93c63245 100644
--- a/Graphics/GraphicsEngineOpenGL/build/Win32/GraphicsEngineOpenGL.vcxproj
+++ b/Graphics/GraphicsEngineOpenGL/build/Win32/GraphicsEngineOpenGL.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DbgDLL|ARM">
-      <Configuration>DbgDLL</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="DbgDLL|Win32">
       <Configuration>DbgDLL</Configuration>
       <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
       <Configuration>DbgDLL</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -25,10 +17,6 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="RelDLL|ARM">
-      <Configuration>RelDLL</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="RelDLL|Win32">
       <Configuration>RelDLL</Configuration>
       <Platform>Win32</Platform>
@@ -37,10 +25,6 @@
       <Configuration>RelDLL</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -108,22 +92,6 @@
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DbgDLL|ARM'" Label="Configuration">
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelDLL|ARM'" Label="Configuration">
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -179,18 +147,6 @@
     <Import Project="GraphicsEngineOpenGL.props" />
     <Import Project="..\..\..\Shared\build\Windows\DLLCommon.props" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <Import Project="..\..\..\..\Shared\build\Windows\Android32d.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DbgDLL|ARM'" Label="PropertySheets">
-    <Import Project="..\..\..\..\Shared\build\Windows\Android32d.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <Import Project="..\..\..\..\Shared\build\Windows\Android32r.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='RelDLL|ARM'" Label="PropertySheets">
-    <Import Project="..\..\..\..\Shared\build\Windows\Android32r.props" />
-  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DbgDLL|Win32'" />
@@ -200,18 +156,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelDLL|Win32'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelDLL|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <NMakeForcedIncludes>$(ProjectDir)\Android\gcc_Debug.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DbgDLL|ARM'">
-    <NMakeForcedIncludes>$(ProjectDir)\Android\gcc_Debug.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <NMakeForcedIncludes>$(ProjectDir)\Android\gcc_Release.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelDLL|ARM'">
-    <NMakeForcedIncludes>$(ProjectDir)\Android\gcc_Release.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -386,10 +330,6 @@
     <ClCompile Include="..\..\src\BufferViewGLImpl.cpp" />
     <ClCompile Include="..\..\src\DeviceContextGLImpl.cpp" />
     <ClCompile Include="..\..\src\DLLMain.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DbgDLL|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='RelDLL|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -407,12 +347,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='RelDLL|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\GLContextState.cpp" />
-    <ClCompile Include="..\..\src\GLContextWindows.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DbgDLL|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='RelDLL|ARM'">true</ExcludedFromBuild>
-    </ClCompile>
+    <ClCompile Include="..\..\src\GLContextWindows.cpp" />
     <ClCompile Include="..\..\src\GLObjectWrapper.cpp" />
     <ClCompile Include="..\..\src\GLProgram.cpp" />
     <ClCompile Include="..\..\src\GLProgramResources.cpp" />
@@ -469,8 +404,6 @@
   <ItemGroup>
     <None Include="..\..\readme.md" />
     <None Include="..\..\src\GraphicsEngineOpenGL.def" />
-    <None Include="jni\Android.mk" />
-    <None Include="jni\Application.mk" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Common\build\Win32\Common.vcxproj">
diff --git a/Graphics/GraphicsEngineOpenGL/build/Win32/GraphicsEngineOpenGL.vcxproj.filters b/Graphics/GraphicsEngineOpenGL/build/Win32/GraphicsEngineOpenGL.vcxproj.filters
index db925dc8..efe009c4 100644
--- a/Graphics/GraphicsEngineOpenGL/build/Win32/GraphicsEngineOpenGL.vcxproj.filters
+++ b/Graphics/GraphicsEngineOpenGL/build/Win32/GraphicsEngineOpenGL.vcxproj.filters
@@ -9,9 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="jni">
-      <UniqueIdentifier>{658fdc9e-6df5-44d2-9888-cdce02006b44}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\Windows">
       <UniqueIdentifier>{f078efc4-26ba-4803-a3a1-eb22a55e7ada}</UniqueIdentifier>
     </Filter>
@@ -279,12 +276,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="jni\Application.mk">
-      <Filter>jni</Filter>
-    </None>
-    <None Include="jni\Android.mk">
-      <Filter>jni</Filter>
-    </None>
     <None Include="..\..\src\GraphicsEngineOpenGL.def">
       <Filter>Source Files</Filter>
     </None>
diff --git a/Graphics/GraphicsEngineOpenGL/build/Win32/jni/Android.mk b/Graphics/GraphicsEngineOpenGL/build/Win32/jni/Android.mk
deleted file mode 100644
index 64b2c110..00000000
--- a/Graphics/GraphicsEngineOpenGL/build/Win32/jni/Android.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-# Android NDK project makefile autogenerated by Premake
-
-# Preamble
-DEPENDENCY_PATH := $(call my-dir)
-LOCAL_PATH := $(abspath $(DEPENDENCY_PATH))
-include $(CLEAR_VARS)
-
-
-# Project configuration
-LOCAL_MODULE := GraphicsEngineOpenGL
-LOCAL_CFLAGS := -std=c++11 -DUSE_GL3_STUB=0 -DENGINE_DLL -DBUILDING_DLL -fvisibility=hidden
-LOCAL_CPP_FEATURES := exceptions rtti
-LOCAL_STATIC_LIBRARIES += GraphicsEngine-prebuilt HLSL2GLSLConverterLib-prebuilt AndroidPlatform-prebuilt BasicPlatform-prebuilt GraphicsTools-prebuilt Common-prebuilt
-LOCAL_LDLIBS := -lGLESv3 -lEGL -llog -landroid
-
-# Include paths
-PROJECT_ROOT := $(LOCAL_PATH)/../../..
-SOLUTION_ROOT := $(PROJECT_ROOT)/../..
-LOCAL_C_INCLUDES := $(PROJECT_ROOT)/include $(PROJECT_ROOT)/interface $(SOLUTION_ROOT)/External
-
-# Source files
-#VisualGDBAndroid: AutoUpdateSourcesInNextLine
-LOCAL_SRC_FILES := ../../../src/BufferGLImpl.cpp ../../../src/BufferViewGLImpl.cpp ../../../src/DeviceContextGLImpl.cpp ../../../src/DLLMain.cpp ../../../src/FBOCache.cpp ../../../src/GLContextAndroid.cpp ../../../src/GLContextState.cpp ../../../src/GLContextWindows.cpp ../../../src/GLObjectWrapper.cpp ../../../src/GLProgram.cpp ../../../src/GLProgramResources.cpp ../../../src/GLStubs.cpp ../../../src/GLTypeConversions.cpp ../../../src/PipelineStateGLImpl.cpp ../../../src/RenderDeviceGLImpl.cpp ../../../src/RenderDeviceGLESImpl.cpp ../../../src/SamplerGLImpl.cpp ../../../src/ShaderResourceBindingGLImpl.cpp ../../../src/SwapChainGLImpl.cpp ../../../src/TexRegionRender.cpp ../../../src/Texture1DArray_OGL.cpp ../../../src/Texture1D_OGL.cpp ../../../src/Texture2DArray_OGL.cpp ../../../src/Texture2D_OGL.cpp ../../../src/Texture3D_OGL.cpp ../../../src/TextureBaseGL.cpp ../../../src/TextureCubeArray_OGL.cpp ../../../src/TextureCube_OGL.cpp ../../../src/TextureViewGLImpl.cpp ../../../src/VAOCache.cpp ../../../src/RenderDeviceFactoryOpenGL.cpp ../../../src/ShaderGLImpl.cpp ../../../src/pch.cpp
-
-#VisualGDBAndroid: VSExcludeListLocation
-VISUALGDB_VS_EXCLUDED_FILES_Release := ../../../src/DLLMain.cpp ../../../src/GLContextWindows.cpp
-VISUALGDB_VS_EXCLUDED_FILES_Debug := ../../../src/DLLMain.cpp ../../../src/GLContextWindows.cpp
-LOCAL_SRC_FILES := $(filter-out $(VISUALGDB_VS_EXCLUDED_FILES_$(VGDB_VSCONFIG)),$(LOCAL_SRC_FILES))
-include $(BUILD_SHARED_LIBRARY)
-
-
-LOCAL_MODULE := GraphicsEngineOpenGL_static
-LOCAL_MODULE_FILENAME := libGraphicsEngineOpenGL
-LOCAL_CFLAGS := -std=c++11 -DUSE_GL3_STUB=0
-LOCAL_LDLIBS :=
-include $(BUILD_STATIC_LIBRARY)
-
-
-
-include $(CLEAR_VARS)
-# Declare pre-built Common library
-LOCAL_MODULE := Common-prebuilt
-LOCAL_EXPORT_C_INCLUDES := $(SOLUTION_ROOT)/Common/include $(SOLUTION_ROOT)/Common/interface
-LOCAL_SRC_FILES := $(SOLUTION_ROOT)/Common/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libCommon.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-
-include $(CLEAR_VARS)
-# Declare pre-built AndroidPlatform library
-LOCAL_MODULE := AndroidPlatform-prebuilt
-LOCAL_SRC_FILES := $(SOLUTION_ROOT)/Platforms/Android/build/Windows/obj/local/$(TARGET_ARCH_ABI)/libAndroidPlatform.a
-LOCAL_EXPORT_C_INCLUDES := $(SOLUTION_ROOT)/Platforms/interface
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-# Declare pre-built BasicPlatform library
-LOCAL_MODULE := BasicPlatform-prebuilt
-LOCAL_SRC_FILES := $(SOLUTION_ROOT)/Platforms/Basic/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libBasicPlatform.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-# Declare pre-built GraphicsEngine library
-LOCAL_MODULE := GraphicsEngine-prebuilt
-LOCAL_SRC_FILES := $(SOLUTION_ROOT)/Graphics/GraphicsEngine/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libGraphicsEngine.a
-LOCAL_EXPORT_C_INCLUDES := $(SOLUTION_ROOT)/Graphics/GraphicsEngine/include $(SOLUTION_ROOT)/Graphics/GraphicsEngine/interface
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-# Declare pre-built Graphics Tools library
-LOCAL_MODULE := GraphicsTools-prebuilt
-LOCAL_SRC_FILES := $(SOLUTION_ROOT)/Graphics/GraphicsTools/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libGraphicsTools.a
-LOCAL_EXPORT_C_INCLUDES := $(SOLUTION_ROOT)/Graphics/GraphicsTools/include
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-# Declare pre-built HLSL2GLSLConverterLib library
-LOCAL_MODULE := HLSL2GLSLConverterLib-prebuilt
-LOCAL_SRC_FILES := $(SOLUTION_ROOT)/Graphics/HLSL2GLSLConverterLib/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libHLSL2GLSLConverterLib.a
-LOCAL_EXPORT_C_INCLUDES := $(SOLUTION_ROOT)/Graphics/HLSL2GLSLConverterLib/include $(SOLUTION_ROOT)/Graphics/HLSL2GLSLConverterLib/interface
-include $(PREBUILT_STATIC_LIBRARY)
diff --git a/Graphics/GraphicsEngineOpenGL/build/Win32/jni/Application.mk b/Graphics/GraphicsEngineOpenGL/build/Win32/jni/Application.mk
deleted file mode 100644
index 4147fd50..00000000
--- a/Graphics/GraphicsEngineOpenGL/build/Win32/jni/Application.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated by VisualGDB
-
-DEPENDENCY_PATH := $(call my-dir)
-LOCAL_PATH := $(abspath $(DEPENDENCY_PATH))
-include $(LOCAL_PATH)/../../../../../Common/make/AppCommon.mk
-
-APP_MODULES := GraphicsEngineOpenGL GraphicsEngineOpenGL_static
\ No newline at end of file