ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clang: no support of f-abi-version=6 option

This commit is contained in:
Gregory Hainaut 2014-12-12 21:56:01 +01:00
parent 768362852e
commit 7d21497c11
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/GSdx/CMakeLists.txt
View File

@ -19,7 +19,6 @@ set(CommonFlags
-Wno-unknown-pragmas -Wno-unknown-pragmas
-Wno-parentheses -Wno-parentheses
-Wunused-variable # __dummy variable need to be investigated -Wunused-variable # __dummy variable need to be investigated
-fabi-version=6
) )
set(OptimizationFlags set(OptimizationFlags
@ -27,44 +26,36 @@ set(OptimizationFlags
-DNDEBUG -DNDEBUG
) )
#Clang doesn't support a few common flags that GCC does.
if(NOT USE_CLANG AND _M_X86_32)
set(GSdxFinalFlags
${GSdxFinalFlags} ${CommonFlags} -mpreferred-stack-boundary=2
)
endif()
# Debug - Build # Debug - Build
if(CMAKE_BUILD_TYPE STREQUAL Debug) if(CMAKE_BUILD_TYPE STREQUAL Debug)
set(GSdxFinalFlags set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} -D_DEBUG -g -Wall)
${GSdxFinalFlags} ${CommonFlags} -D_DEBUG -g -Wall
)
endif() endif()
# Devel - Build # Devel - Build
if(CMAKE_BUILD_TYPE STREQUAL Devel) if(CMAKE_BUILD_TYPE STREQUAL Devel)
set(GSdxFinalFlags set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} ${OptimizationFlags} -D_DEVEL -g)
${GSdxFinalFlags} ${CommonFlags} ${OptimizationFlags} -D_DEVEL -g
)
endif() endif()
# Release - Build # Release - Build
if(CMAKE_BUILD_TYPE STREQUAL Release) if(CMAKE_BUILD_TYPE STREQUAL Release)
set(GSdxFinalFlags set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} ${OptimizationFlags} -W)
${GSdxFinalFlags} ${CommonFlags} ${OptimizationFlags} -W
)
endif() endif()
if(XDG_STD) if(XDG_STD)
set(GSdxFinalFlags set(GSdxFinalFlags ${GSdxFinalFlags} -DXDG_STD)
${GSdxFinalFlags} -DXDG_STD
)
endif() endif()
if(GLES_API AND GLESV2_FOUND) if(GLES_API AND GLESV2_FOUND)
set(GSdxFinalFlags set(GSdxFinalFlags ${GSdxFinalFlags} -DENABLE_GLES)
${GSdxFinalFlags} -DENABLE_GLES endif()
)
#Clang doesn't support a few common flags that GCC does.
if(NOT USE_CLANG)
set(GSdxFinalFlags ${GSdxFinalFlags} -fabi-version=6)
if (_M_X86_32)
set(GSdxFinalFlags ${GSdxFinalFlags} -mpreferred-stack-boundary=2)
endif()
endif() endif()
set(GSdxSources set(GSdxSources
@ -87,7 +78,7 @@ set(GSdxSources
GSCrc.cpp GSCrc.cpp
GSDevice.cpp GSDevice.cpp
GSDeviceOGL.cpp GSDeviceOGL.cpp
GSDeviceSW.cpp GSDeviceSW.cpp
GSDeviceNull.cpp GSDeviceNull.cpp
GSDirtyRect.cpp GSDirtyRect.cpp
GSDrawScanline.cpp GSDrawScanline.cpp
@ -126,7 +117,7 @@ set(GSdxSources
GSTextureFXOGL.cpp GSTextureFXOGL.cpp
GSTextureOGL.cpp GSTextureOGL.cpp
GSTextureNull.cpp GSTextureNull.cpp
GSTextureSW.cpp GSTextureSW.cpp
GSThread.cpp GSThread.cpp
GSUtil.cpp GSUtil.cpp
GSVector.cpp GSVector.cpp
@ -243,7 +234,7 @@ add_pcsx2_plugin(${Output} "${GSdxFinalSources}" "${GSdxFinalLibs}" "${GSdxFinal
################################### Replay Loader ################################### Replay Loader
if(BUILD_REPLAY_LOADERS) if(BUILD_REPLAY_LOADERS)
set(Replay pcsx2_GSReplayLoader) set(Replay pcsx2_GSReplayLoader)
set(GSdxReplayLoaderFinalSources set(GSdxReplayLoaderFinalSources
${GSdxFinalSources} ${GSdxFinalSources}
linux_replay.cpp linux_replay.cpp

2
plugins/GSdx/stdafx.h
View File

@ -273,7 +273,7 @@ struct aligned_free_second {template<class T> void operator()(T& p) {_aligned_fr
#endif #endif
// sse // sse
#ifndef _WINDOWS #ifdef __GNUC__
// Convert gcc see define into GSdx (windows) define // Convert gcc see define into GSdx (windows) define
#if defined(__AVX2__) #if defined(__AVX2__)
#define _M_SSE 0x501 #define _M_SSE 0x501