diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-06-08 09:30:57 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-06-08 09:30:57 -0500 |
| commit | 4cfeeee5e9415f266328ebacdffc1aa545aee8f8 (patch) | |
| tree | b954037909c2f86e9121ff5e9f270dcb8e11f44d /Source | |
| parent | 489534bc7ca7d9ba8e3b9c0ea448d5165e2e61f6 (diff) | |
| parent | 6e1d312091598aae7f97fe1b1108ce9cc52b721b (diff) | |
Merge pull request #472 from Sonicadvance1/ARM-is-not-generic
Make it so ARMv7 isn't a generic target.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Common/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | Source/Core/Common/CommonFuncs.h | 8 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/CMakeLists.txt | 2 |
3 files changed, 15 insertions, 16 deletions
diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 13391e03d4..90385653f7 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -31,17 +31,16 @@ set(SRCS BreakPoints.cpp if(_M_ARM_32) #ARMv7 set(SRCS ${SRCS} ArmCPUDetect.cpp - ArmEmitter.cpp) -else() - if(_M_X86) #X86 - set(SRCS ${SRCS} - x64FPURoundMode.cpp) - endif() - set(SRCS ${SRCS} x64CPUDetect.cpp) -endif() -if(_M_GENERIC) #Generic - set(SRCS ${SRCS} - GenericFPURoundMode.cpp) + ArmEmitter.cpp + GenericFPURoundMode.cpp) +elseif(_M_X86) #X86 + set(SRCS ${SRCS} + x64CPUDetect.cpp + x64FPURoundMode.cpp) +else() #Generic + set(SRCS ${SRCS} + GenericFPURoundMode.cpp + x64CPUDetect.cpp) endif() if(WIN32) set(SRCS ${SRCS} ExtendedTrace.cpp) diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index a4a5d8baa6..9c6bbc67be 100644 --- a/Source/Core/Common/CommonFuncs.h +++ b/Source/Core/Common/CommonFuncs.h @@ -36,7 +36,7 @@ struct ArraySizeImpl : public std::extent<T> #endif #if (defined __GNUC__ && !__GNUC_PREREQ(4,9)) && \ - !defined __SSSE3__ && !defined _M_GENERIC + !defined __SSSE3__ && defined _M_X86 #include <emmintrin.h> static __inline __m128i __attribute__((__always_inline__)) _mm_shuffle_epi8(__m128i a, __m128i mask) @@ -61,10 +61,10 @@ _mm_shuffle_epi8(__m128i a, __m128i mask) // go to debugger mode #ifdef GEKKO #define Crash() - #elif defined _M_GENERIC - #define Crash() { exit(1); } - #else + #elif defined _M_X86 #define Crash() {asm ("int $3");} + #else + #define Crash() { exit(1); } #endif // GCC 4.8 defines all the rotate functions now diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index d700c131d4..844184210d 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -38,7 +38,7 @@ set(SRCS BPFunctions.cpp XFStructs.cpp) set(LIBS core png) -if(NOT _M_GENERIC) +if(_M_X86) set(SRCS ${SRCS} TextureDecoder_x64.cpp) else() set(SRCS ${SRCS} TextureDecoder_Generic.cpp) |