From b39c053785abc4a94ce380885a846c5d8be89675 Mon Sep 17 00:00:00 2001
From: bunnei
Date: Fri, 14 Aug 2015 22:29:08 -0400
Subject: Rename ARCHITECTURE_X64 definition to ARCHITECTURE_x86_64.

---
 src/video_core/CMakeLists.txt    |  2 +-
 src/video_core/shader/shader.cpp | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/video_core')

diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index 221abc160..183709d8b 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -42,7 +42,7 @@ set(HEADERS
             video_core.h
             )
 
-if(ARCHITECTURE_X64)
+if(ARCHITECTURE_x86_64)
     set(SRCS ${SRCS}
             shader/shader_jit_x64.cpp)
 
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp
index f7459e2ad..06c1fe653 100644
--- a/src/video_core/shader/shader.cpp
+++ b/src/video_core/shader/shader.cpp
@@ -16,20 +16,18 @@
 #include "shader.h"
 #include "shader_interpreter.h"
 
-#ifdef ARCHITECTURE_X64
+#ifdef ARCHITECTURE_x86_64
 #include "shader_jit_x64.h"
-#endif // ARCHITECTURE_X64
+#endif // ARCHITECTURE_x86_64
 
 namespace Pica {
 
 namespace Shader {
 
 #ifdef ARCHITECTURE_x86_64
-
 static std::unordered_map<u64, CompiledShader*> shader_map;
 static JitCompiler jit;
 static CompiledShader* jit_shader;
-
 #endif // ARCHITECTURE_x86_64
 
 void Setup(UnitState& state) {
@@ -46,7 +44,8 @@ void Setup(UnitState& state) {
             jit_shader = jit.Compile();
             shader_map.emplace(cache_key, jit_shader);
         }
-#endif // ARCHITECTURE_X64
+    }
+#endif // ARCHITECTURE_x86_64
 }
 
 void Shutdown() {
@@ -95,7 +94,7 @@ OutputVertex Run(UnitState& state, const InputVertex& input, int num_attributes)
         RunInterpreter(state);
 #else
     RunInterpreter(state);
-#endif // ARCHITECTURE_X64
+#endif // ARCHITECTURE_x86_64
 
 #if PICA_DUMP_SHADERS
     DebugUtils::DumpShader(setup.program_code.data(), state.debug.max_offset, setup.swizzle_data.data(),
-- 
cgit v1.2.3