diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/common/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/common/platform.h | 34 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 1 |
4 files changed, 3 insertions, 36 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fcf0874f..bcd169643 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -160,6 +160,9 @@ set_property(DIRECTORY APPEND PROPERTY | |||
| 160 | COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>) | 160 | COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>) |
| 161 | 161 | ||
| 162 | 162 | ||
| 163 | math(EXPR EMU_ARCH_BITS ${CMAKE_SIZEOF_VOID_P}*8) | ||
| 164 | add_definitions(-DEMU_ARCH_BITS=${EMU_ARCH_BITS}) | ||
| 165 | |||
| 163 | # System imported libraries | 166 | # System imported libraries |
| 164 | # ====================== | 167 | # ====================== |
| 165 | 168 | ||
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index d132ab969..581c46b52 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -58,7 +58,6 @@ add_library(common STATIC | |||
| 58 | misc.cpp | 58 | misc.cpp |
| 59 | param_package.cpp | 59 | param_package.cpp |
| 60 | param_package.h | 60 | param_package.h |
| 61 | platform.h | ||
| 62 | quaternion.h | 61 | quaternion.h |
| 63 | scm_rev.cpp | 62 | scm_rev.cpp |
| 64 | scm_rev.h | 63 | scm_rev.h |
diff --git a/src/common/platform.h b/src/common/platform.h deleted file mode 100644 index c62fb7c8f..000000000 --- a/src/common/platform.h +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | /** | ||
| 2 | * Copyright (C) 2005-2012 Gekko Emulator | ||
| 3 | * | ||
| 4 | * @file platform.h | ||
| 5 | * @author ShizZy <shizzy247@gmail.com> | ||
| 6 | * @date 2012-02-11 | ||
| 7 | * @brief Platform detection macros for portable compilation | ||
| 8 | * | ||
| 9 | * @section LICENSE | ||
| 10 | * This program is free software; you can redistribute it and/or | ||
| 11 | * modify it under the terms of the GNU General Public License as | ||
| 12 | * published by the Free Software Foundation; either version 2 of | ||
| 13 | * the License, or (at your option) any later version. | ||
| 14 | * | ||
| 15 | * This program is distributed in the hope that it will be useful, but | ||
| 16 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 18 | * General Public License for more details at | ||
| 19 | * http://www.gnu.org/copyleft/gpl.html | ||
| 20 | * | ||
| 21 | * Official project repository can be found at: | ||
| 22 | * http://code.google.com/p/gekko-gc-emu/ | ||
| 23 | */ | ||
| 24 | |||
| 25 | #pragma once | ||
| 26 | |||
| 27 | //////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| 28 | // Platform detection | ||
| 29 | |||
| 30 | #if defined(ARCHITECTURE_x86_64) || defined(__aarch64__) | ||
| 31 | #define EMU_ARCH_BITS 64 | ||
| 32 | #elif defined(__i386) || defined(_M_IX86) || defined(__arm__) || defined(_M_ARM) | ||
| 33 | #define EMU_ARCH_BITS 32 | ||
| 34 | #endif | ||
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 5802b9855..eb22a8ccf 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include "common/logging/log.h" | 18 | #include "common/logging/log.h" |
| 19 | #include "common/logging/text_formatter.h" | 19 | #include "common/logging/text_formatter.h" |
| 20 | #include "common/microprofile.h" | 20 | #include "common/microprofile.h" |
| 21 | #include "common/platform.h" | ||
| 22 | #include "common/scm_rev.h" | 21 | #include "common/scm_rev.h" |
| 23 | #include "common/scope_exit.h" | 22 | #include "common/scope_exit.h" |
| 24 | #include "common/string_util.h" | 23 | #include "common/string_util.h" |