From 33adabb035bffc73d4380440d087daf05822894f Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 15 Jul 2014 18:21:03 -0500 Subject: [PATCH] Fix some _M_AMD64 checks in GSdx. In the future these will be _M_X86_64, but for now this won't be the case. --- plugins/GSdx/GPUDrawScanlineCodeGenerator.cpp | 4 ---- plugins/GSdx/GPUSetupPrimCodeGenerator.cpp | 4 ---- plugins/GSdx/GS.cpp | 2 +- plugins/GSdx/GSUtil.cpp | 2 +- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/plugins/GSdx/GPUDrawScanlineCodeGenerator.cpp b/plugins/GSdx/GPUDrawScanlineCodeGenerator.cpp index f37c33b63d..c92e28d7c3 100644 --- a/plugins/GSdx/GPUDrawScanlineCodeGenerator.cpp +++ b/plugins/GSdx/GPUDrawScanlineCodeGenerator.cpp @@ -33,10 +33,6 @@ GPUDrawScanlineCodeGenerator::GPUDrawScanlineCodeGenerator(void* param, uint32 k : GSCodeGenerator(code, maxsize) , m_local(*(GPUScanlineLocalData*)param) { - #if _M_AMD64 - //#error TODO - #endif - m_sel.key = key; Generate(); diff --git a/plugins/GSdx/GPUSetupPrimCodeGenerator.cpp b/plugins/GSdx/GPUSetupPrimCodeGenerator.cpp index c4cd4274f2..5367fc3a0b 100644 --- a/plugins/GSdx/GPUSetupPrimCodeGenerator.cpp +++ b/plugins/GSdx/GPUSetupPrimCodeGenerator.cpp @@ -36,10 +36,6 @@ GPUSetupPrimCodeGenerator::GPUSetupPrimCodeGenerator(void* param, uint32 key, vo : GSCodeGenerator(code, maxsize) , m_local(*(GPUScanlineLocalData*)param) { - #if _M_AMD64 - //#error TODO - #endif - m_sel.key = key; Generate(); diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp index 979820f37c..2f23f0903f 100644 --- a/plugins/GSdx/GS.cpp +++ b/plugins/GSdx/GS.cpp @@ -99,7 +99,7 @@ EXPORT_C_(void) PS2EsetEmuVersion(const char* emuId, uint32 version) EXPORT_C_(uint32) PS2EgetCpuPlatform() { -#if _M_AMD64 +#ifdef _M_AMD64 return PS2E_X86_64; diff --git a/plugins/GSdx/GSUtil.cpp b/plugins/GSdx/GSUtil.cpp index 2210d0e0e4..533e51642a 100644 --- a/plugins/GSdx/GSUtil.cpp +++ b/plugins/GSdx/GSUtil.cpp @@ -46,7 +46,7 @@ const char* GSUtil::GetLibName() if(SVN_MODS) str += "m"; #endif - #if _M_AMD64 + #ifdef _M_AMD64 str += " 64-bit"; #endif