diff --git a/build.sh b/build.sh index da75e3f57c..5673e8d037 100755 --- a/build.sh +++ b/build.sh @@ -16,7 +16,12 @@ #set -e # This terminates the script in case of any error +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 flags=(-DCMAKE_BUILD_PO=FALSE) +fi cleanBuild=0 useClang=0 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