diff options
| author | bunnei <bunneidev@gmail.com> | 2018-03-21 23:49:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-21 23:49:00 +0100 |
| commit | 2ab021da14b329cff67a209aa3b52e2308ff22d4 (patch) | |
| tree | bfd62c06f66d7bfba7eb350c54b849ca551dffe2 | |
| parent | Merge pull request #259 from N00byKing/usehttps (diff) | |
| parent | CMake: Set EMU_ARCH_BITS in CMakeLists.txt (diff) | |
| download | yuzu-2ab021da14b329cff67a209aa3b52e2308ff22d4.tar yuzu-2ab021da14b329cff67a209aa3b52e2308ff22d4.tar.gz yuzu-2ab021da14b329cff67a209aa3b52e2308ff22d4.tar.bz2 yuzu-2ab021da14b329cff67a209aa3b52e2308ff22d4.tar.lz yuzu-2ab021da14b329cff67a209aa3b52e2308ff22d4.tar.xz yuzu-2ab021da14b329cff67a209aa3b52e2308ff22d4.tar.zst yuzu-2ab021da14b329cff67a209aa3b52e2308ff22d4.zip | |
| -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 COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>) +math(EXPR EMU_ARCH_BITS ${CMAKE_SIZEOF_VOID_P}*8) +add_definitions(-DEMU_ARCH_BITS=${EMU_ARCH_BITS}) + # System imported libraries # ====================== 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 misc.cpp param_package.cpp param_package.h - platform.h quaternion.h scm_rev.cpp 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 @@ -/** - * Copyright (C) 2005-2012 Gekko Emulator - * - * @file platform.h - * @author ShizZy <shizzy247@gmail.com> - * @date 2012-02-11 - * @brief Platform detection macros for portable compilation - * - * @section LICENSE - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details at - * http://www.gnu.org/copyleft/gpl.html - * - * Official project repository can be found at: - * http://code.google.com/p/gekko-gc-emu/ - */ - -#pragma once - -//////////////////////////////////////////////////////////////////////////////////////////////////// -// Platform detection - -#if defined(ARCHITECTURE_x86_64) || defined(__aarch64__) -#define EMU_ARCH_BITS 64 -#elif defined(__i386) || defined(_M_IX86) || defined(__arm__) || defined(_M_ARM) -#define EMU_ARCH_BITS 32 -#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 @@ #include "common/logging/log.h" #include "common/logging/text_formatter.h" #include "common/microprofile.h" -#include "common/platform.h" #include "common/scm_rev.h" #include "common/scope_exit.h" #include "common/string_util.h" |