diff options
| author | bunnei <bunneidev@gmail.com> | 2015-08-12 06:19:20 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-08-16 00:03:26 +0200 |
| commit | a1942238f5046811833e9636c64f991905960732 (patch) | |
| tree | 47de97e98aa464cee8e9297f419ac99c289a2293 | |
| parent | x64: Refactor to remove fake interfaces and general cleanups. (diff) | |
| download | yuzu-a1942238f5046811833e9636c64f991905960732.tar yuzu-a1942238f5046811833e9636c64f991905960732.tar.gz yuzu-a1942238f5046811833e9636c64f991905960732.tar.bz2 yuzu-a1942238f5046811833e9636c64f991905960732.tar.lz yuzu-a1942238f5046811833e9636c64f991905960732.tar.xz yuzu-a1942238f5046811833e9636c64f991905960732.tar.zst yuzu-a1942238f5046811833e9636c64f991905960732.zip | |
| -rw-r--r-- | src/common/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/common/x64/cpu_detect.cpp (renamed from src/common/cpu_detect.cpp) | 4 | ||||
| -rw-r--r-- | src/common/x64/cpu_detect.h (renamed from src/common/cpu_detect.h) | 0 | ||||
| -rw-r--r-- | src/common/x64/emitter.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/shader/shader_jit_x64.cpp | 3 |
5 files changed, 6 insertions, 7 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index fe82f71e8..53c915606 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 index 1d612829e..72c8297a3 100644 --- a/src/common/cpu_detect.cpp +++ b/src/common/x64/cpu_detect.cpp @@ -5,9 +5,9 @@ #include <cstring> #include <string> -#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 index 19a2c25d6..19a2c25d6 100644 --- a/src/common/cpu_detect.h +++ b/src/common/x64/cpu_detect.h diff --git a/src/common/x64/emitter.cpp b/src/common/x64/emitter.cpp index 4e1c43d6c..5463841d7 100644 --- a/src/common/x64/emitter.cpp +++ b/src/common/x64/emitter.cpp @@ -18,11 +18,11 @@ #include <cstring> #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 1e20a06a7..93e665d43 100644 --- a/src/video_core/shader/shader_jit_x64.cpp +++ b/src/video_core/shader/shader_jit_x64.cpp @@ -4,9 +4,8 @@ #include <smmintrin.h> -#include "common/cpu_detect.h" - #include "common/x64/abi.h" +#include "common/x64/cpu_detect.h" #include "common/x64/emitter.h" #include "shader.h" |