diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
index 1fe226758a..c7e4618be1 100644
--- a/plugins/GSdx/CMakeLists.txt
+++ b/plugins/GSdx/CMakeLists.txt
@@ -3,7 +3,7 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
     message(FATAL_ERROR "
     You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
     It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
+endif()
 
 
 # plugin name
@@ -27,28 +27,28 @@ set(OptimizationFlags
     )
 
 #Clang doesn't support a few common flags that GCC does.
-if(NOT USE_CLANG)
+if(NOT USE_CLANG AND _M_X86_32)
 	add_definitions(${CommonFlags} -mpreferred-stack-boundary=2)
-endif(NOT USE_CLANG)
+endif()
 
 # Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
     add_definitions(${CommonFlags} -D_DEBUG -g -Wall)
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+endif()
 
 # Devel - Build
 if(CMAKE_BUILD_TYPE STREQUAL Devel)
     add_definitions(${CommonFlags} ${OptimizationFlags} -D_DEVEL -g)
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+endif()
 
 # Release - Build
 if(CMAKE_BUILD_TYPE STREQUAL Release)
     add_definitions(${CommonFlags} ${OptimizationFlags} -W)
-endif(CMAKE_BUILD_TYPE STREQUAL Release)
+endif()
 
 if(XDG_STD)
     add_definitions(-DXDG_STD)
-endif(XDG_STD)
+endif()
 
 if(GLES_API AND GLESV2_FOUND)
     add_definitions(-DENABLE_GLES)