From a1942238f5046811833e9636c64f991905960732 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 12 Aug 2015 00:19:20 -0400 Subject: [PATCH] Common: Move cpu_detect to x64 directory. --- src/common/CMakeLists.txt | 4 ++-- src/common/{ => x64}/cpu_detect.cpp | 4 ++-- src/common/{ => x64}/cpu_detect.h | 0 src/common/x64/emitter.cpp | 2 +- src/video_core/shader/shader_jit_x64.cpp | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) rename src/common/{ => x64}/cpu_detect.cpp (99%) rename src/common/{ => x64}/cpu_detect.h (100%) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index fe82f71e8a..53c9156062 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -3,7 +3,6 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" "${CMAKE_CURRENT_SOU set(SRCS break_points.cpp - cpu_detect.cpp emu_window.cpp file_util.cpp hash.cpp @@ -31,7 +30,6 @@ set(HEADERS common_funcs.h common_paths.h common_types.h - cpu_detect.h debug_interface.h emu_window.h file_util.h @@ -63,10 +61,12 @@ set(HEADERS if(ARCHITECTURE_X64) set(SRCS ${SRCS} x64/abi.cpp + x64/cpu_detect.cpp x64/emitter.cpp) set(HEADERS ${HEADERS} x64/abi.h + x64/cpu_detect.h x64/emitter.h) endif() diff --git a/src/common/cpu_detect.cpp b/src/common/x64/cpu_detect.cpp similarity index 99% rename from src/common/cpu_detect.cpp rename to src/common/x64/cpu_detect.cpp index 1d612829e3..72c8297a30 100644 --- a/src/common/cpu_detect.cpp +++ b/src/common/x64/cpu_detect.cpp @@ -5,9 +5,9 @@ #include #include -#include "common_types.h" +#include "common/common_types.h" + #include "cpu_detect.h" -#include "hash.h" #ifndef _WIN32 diff --git a/src/common/cpu_detect.h b/src/common/x64/cpu_detect.h similarity index 100% rename from src/common/cpu_detect.h rename to src/common/x64/cpu_detect.h diff --git a/src/common/x64/emitter.cpp b/src/common/x64/emitter.cpp index 4e1c43d6cf..5463841d74 100644 --- a/src/common/x64/emitter.cpp +++ b/src/common/x64/emitter.cpp @@ -18,11 +18,11 @@ #include #include "common/assert.h" -#include "common/cpu_detect.h" #include "common/logging/log.h" #include "common/memory_util.h" #include "abi.h" +#include "cpu_detect.h" #include "emitter.h" #define PRIx64 "llx" diff --git a/src/video_core/shader/shader_jit_x64.cpp b/src/video_core/shader/shader_jit_x64.cpp index 1e20a06a79..93e665d43c 100644 --- a/src/video_core/shader/shader_jit_x64.cpp +++ b/src/video_core/shader/shader_jit_x64.cpp @@ -4,9 +4,8 @@ #include -#include "common/cpu_detect.h" - #include "common/x64/abi.h" +#include "common/x64/cpu_detect.h" #include "common/x64/emitter.h" #include "shader.h"