From a4699a37df6458826f17aca4d21af243bf4459e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Mon, 13 Mar 2017 23:45:25 +0100
Subject: [PATCH] Update armips with regex workaround

---
 CMakeLists.txt                  | 5 +++--
 Common/stdafx.h                 | 2 ++
 ext/CMakeLists.txt              | 5 ++++-
 ext/armips                      | 2 +-
 ext/cmake/armips/CMakeLists.txt | 9 ++++++++-
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25f20af4ac9d..f3da2b4056f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -356,6 +356,9 @@ add_library(Common STATIC
 	Common/ThreadSafeList.h
 	Common/Timer.cpp
 	Common/Timer.h)
+
+add_subdirectory(ext)
+
 include_directories(Common)
 setup_target_project(Common Common)
 
@@ -374,8 +377,6 @@ if(USING_GLES2)
 	find_package(X11)
 endif()
 
-add_subdirectory(ext)
-
 add_library(vjson STATIC
 	ext/native/ext/vjson/json.cpp
 	ext/native/ext/vjson/json.h
diff --git a/Common/stdafx.h b/Common/stdafx.h
index 94ccaf491082..463ad8211d3f 100644
--- a/Common/stdafx.h
+++ b/Common/stdafx.h
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#ifdef _WIN32
 #ifndef _WIN32_WINNT
 
 #if _MSC_VER < 1700
@@ -36,3 +37,4 @@
 #include "CommonWindows.h"
 #include <tchar.h>
 #include <vector>
+#endif
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
index 7dfecec22263..c616be29d219 100644
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -1,9 +1,12 @@
-add_subdirectory(cmake/armips)
+set(ARMIPS_REGEXP OFF CACHE BOOL "" FORCE)
+
+add_subdirectory(armips)
 if(NOT USING_GLES2)
   add_subdirectory(glew)
 endif()
 
 set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "let's not build binaries we don't need" FORCE)
+
 add_subdirectory(glslang)
 add_subdirectory(snappy)
 add_subdirectory(udis86)
diff --git a/ext/armips b/ext/armips
index 309a15145a1f..11f2681678fa 160000
--- a/ext/armips
+++ b/ext/armips
@@ -1 +1 @@
-Subproject commit 309a15145a1f04306dcdd2214ef9b333b3fde755
+Subproject commit 11f2681678fa05698c488967aa0f71d0ffad9607
diff --git a/ext/cmake/armips/CMakeLists.txt b/ext/cmake/armips/CMakeLists.txt
index 0bac8f0e5009..a91a3cb08bb0 100644
--- a/ext/cmake/armips/CMakeLists.txt
+++ b/ext/cmake/armips/CMakeLists.txt
@@ -1,12 +1,19 @@
 cmake_minimum_required(VERSION 2.8)
 project(armips) 
 
+option(ARMIPS_REGEXP "Enable regexp expression functions" ON)
+
 if(NOT WIN32)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++11")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 endif()
 
 set(ARMIPS_PATH ../../armips)
 
+if(ARMIPS_REGEXP)
+	add_definitions(-DARMIPS_REGEXP=1)
+endif()
+
+include_directories(${ARMIPS_PATH})
 
 add_library(armips
 	${ARMIPS_PATH}/Util/ByteArray.cpp