From 4991ef608d8bf1b5944f9478c09e9cc5fd05dcbc Mon Sep 17 00:00:00 2001
From: 3kinox <fafangi@gmail.com>
Date: Tue, 11 Nov 2014 14:49:14 +0100
Subject: [PATCH 1/3] add automatic archlinux build detection(wx path can not
 be found otherwise)

---
 build.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build.sh b/build.sh
index da75e3f57c..98bdbdff8f 100755
--- a/build.sh
+++ b/build.sh
@@ -16,7 +16,13 @@
 
 #set -e # This terminates the script in case of any error
 
+arch64Build=$(uname -a | grep ARCH)
+if [[ -e "arch64Build" ]]; then
+#add flags for archlinux
+flags=(-DCMAKE_BUILD_PO=FALSE -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8')
+else
 flags=(-DCMAKE_BUILD_PO=FALSE)
+fi
 cleanBuild=0
 useClang=0
 

From 06f53b268954adf49643ab580bdb9855404eeff7 Mon Sep 17 00:00:00 2001
From: 3kinox <fafangi@gmail.com>
Date: Tue, 11 Nov 2014 14:50:56 +0100
Subject: [PATCH 2/3] use -fabi_version=6 only for GSdx, solve bug with
 wxwidget reenable avx build for GSdx

---
 build.sh                    | 2 +-
 cmake/BuildParameters.cmake | 2 +-
 plugins/GSdx/CMakeLists.txt | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 98bdbdff8f..2ba6907835 100755
--- a/build.sh
+++ b/build.sh
@@ -16,7 +16,7 @@
 
 #set -e # This terminates the script in case of any error
 
-arch64Build=$(uname -a | grep ARCH)
+arch64Build=$(uname -a | grep ARCH | grep x86_64)
 if [[ -e "arch64Build" ]]; then
 #add flags for archlinux
 flags=(-DCMAKE_BUILD_PO=FALSE -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8')
diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake
index 65ddef92c6..6372b91577 100644
--- a/cmake/BuildParameters.cmake
+++ b/cmake/BuildParameters.cmake
@@ -64,7 +64,7 @@ option(USE_ASAN "Enable address sanitizer")
 # Select the architecture
 #-------------------------------------------------------------------------------
 option(64BIT_BUILD_DONT_WORK "Enable a x86_64 build instead of cross compiling (WARNING: NOTHING WORK)" OFF)
-option(DISABLE_ADVANCE_SIMD "Disable advance use of SIMD (SSE2+ & AVX)" ON)
+option(DISABLE_ADVANCE_SIMD "Disable advance use of SIMD (SSE2+ & AVX)" OFF)
 
 # Architecture bitness detection
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
index e9d41d8f15..edbc574be1 100644
--- a/plugins/GSdx/CMakeLists.txt
+++ b/plugins/GSdx/CMakeLists.txt
@@ -19,6 +19,7 @@ set(CommonFlags
     -Wno-unknown-pragmas
     -Wno-parentheses
     -Wunused-variable # __dummy variable need to be investigated
+    -fabi-version=6
     )
 
 set(OptimizationFlags

From 30240b4cbf6c347968862311dcb58906455f668b Mon Sep 17 00:00:00 2001
From: 3kinox <fafangi@gmail.com>
Date: Tue, 11 Nov 2014 15:39:42 +0100
Subject: [PATCH 3/3] More robust detection of arch64(or any distrib using same
 path for wxwidget)

---
 build.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 2ba6907835..5673e8d037 100755
--- a/build.sh
+++ b/build.sh
@@ -16,8 +16,7 @@
 
 #set -e # This terminates the script in case of any error
 
-arch64Build=$(uname -a | grep ARCH | grep x86_64)
-if [[ -e "arch64Build" ]]; then
+if [[ (-f /usr/bin/wx-config32-2.8 && -f /usr/bin/wxrc32-2.8) ]]; then
 #add flags for archlinux
 flags=(-DCMAKE_BUILD_PO=FALSE -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8')
 else