diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2011-10-03 23:44:35 -0700 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2011-10-03 23:44:35 -0700 |
| commit | b4d751e43cbf72fe666441841f1ee7428794642e (patch) | |
| tree | acb36f4f53eaf14c72add41f8ce0ae5a0bdc60ab /Source/Core/Common | |
| parent | a65385d99538a73c784e573a78f8a90dc29e26e1 (diff) | |
| parent | d3e639a3979205dc3ec52e6205170b03bbde3a1c (diff) | |
Merge branch 'fix-icc-unsafe-string'
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Src/Common.h | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Src/Version.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index bc9b4dc051..888a206d5d 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -143,7 +143,7 @@ private: #define _M_SSE 0x301 #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) #define _M_SSE 0x301 -#elif _MSC_VER >= 1500 // Visual Studio 2008 +#elif (_MSC_VER >= 1500) || __INTEL_COMPILER // Visual Studio 2008 #define _M_SSE 0x402 #endif diff --git a/Source/Core/Common/Src/Version.cpp b/Source/Core/Common/Src/Version.cpp index f3d30398c8..97e232785d 100644 --- a/Source/Core/Common/Src/Version.cpp +++ b/Source/Core/Common/Src/Version.cpp @@ -30,7 +30,12 @@ const char *scm_rev_str = "Dolphin " #if !SCM_IS_MASTER "[" SCM_BRANCH_STR "] " #endif + +#ifdef __INTEL_COMPILER + BUILD_TYPE_STR SCM_DESC_STR "-ICC"; +#else BUILD_TYPE_STR SCM_DESC_STR; +#endif #ifdef _M_X64 #define NP_ARCH "x64" |