From 8d1cab4892158c248d5712e88e131aa04b3b835c Mon Sep 17 00:00:00 2001
From: Cameron Cawley <ccawley2011@gmail.com>
Date: Fri, 16 Mar 2018 13:29:36 +0000
Subject: [PATCH] CMake: Set EMU_ARCH_BITS in CMakeLists.txt

---
 CMakeLists.txt            |  2 ++
 src/citra_qt/main.cpp     |  1 -
 src/common/CMakeLists.txt |  1 -
 src/common/platform.h     | 34 ----------------------------------
 4 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 src/common/platform.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd82dfd87..7a1197540 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,6 +165,8 @@ add_definitions(-DSINGLETHREADED)
 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/citra_qt/main.cpp b/src/citra_qt/main.cpp
index b2951de11..a8c892e58 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -39,7 +39,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"
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index d136213cb..885b3fb46 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -60,7 +60,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