summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Emmanuel Gil Peyrot2015-06-20 20:14:43 +0100
committerGravatar Emmanuel Gil Peyrot2015-06-27 14:43:57 +0100
commitce0cfd62d95cdc46f4517ad16a0396a5815cb595 (patch)
tree0959d0cb4a7ec90063da7fd924321cfe847bb77c
parentCommon: Remove unused SSE version checking and a GCC macro. (diff)
downloadyuzu-ce0cfd62d95cdc46f4517ad16a0396a5815cb595.tar.gz
yuzu-ce0cfd62d95cdc46f4517ad16a0396a5815cb595.tar.xz
yuzu-ce0cfd62d95cdc46f4517ad16a0396a5815cb595.zip
Common: Remove now-unused EMU_PLATFORM define, fixes issue #373.
Diffstat (limited to '')
-rw-r--r--src/citra_qt/main.cpp4
-rw-r--r--src/common/platform.h30
2 files changed, 0 insertions, 34 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 8041816a0..43b80a34a 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -18,10 +18,6 @@
18#include "common/platform.h" 18#include "common/platform.h"
19#include "common/scope_exit.h" 19#include "common/scope_exit.h"
20 20
21#if EMU_PLATFORM == PLATFORM_LINUX
22#include <unistd.h>
23#endif
24
25#include "bootmanager.h" 21#include "bootmanager.h"
26#include "hotkeys.h" 22#include "hotkeys.h"
27 23
diff --git a/src/common/platform.h b/src/common/platform.h
index bda3e7be7..0a912dda3 100644
--- a/src/common/platform.h
+++ b/src/common/platform.h
@@ -24,39 +24,9 @@
24 24
25#pragma once 25#pragma once
26 26
27#include "common/common_types.h"
28
29////////////////////////////////////////////////////////////////////////////////////////////////////
30// Platform definitions
31
32/// Enumeration for defining the supported platforms
33#define PLATFORM_NULL 0
34#define PLATFORM_WINDOWS 1
35#define PLATFORM_MACOSX 2
36#define PLATFORM_LINUX 3
37#define PLATFORM_ANDROID 4
38
39//////////////////////////////////////////////////////////////////////////////////////////////////// 27////////////////////////////////////////////////////////////////////////////////////////////////////
40// Platform detection 28// Platform detection
41 29
42#ifndef EMU_PLATFORM
43
44#if defined( __WIN32__ ) || defined( _WIN32 )
45#define EMU_PLATFORM PLATFORM_WINDOWS
46
47#elif defined( __APPLE__ ) || defined( __APPLE_CC__ )
48#define EMU_PLATFORM PLATFORM_MACOSX
49
50#elif defined(__linux__)
51#define EMU_PLATFORM PLATFORM_LINUX
52
53#else // Assume linux otherwise
54#define EMU_PLATFORM PLATFORM_LINUX
55
56#endif
57
58#endif
59
60#if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) 30#if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__)
61 #define EMU_ARCH_BITS 64 31 #define EMU_ARCH_BITS 64
62#elif defined(__i386) || defined(_M_IX86) || defined(__arm__) || defined(_M_ARM) 32#elif defined(__i386) || defined(_M_IX86) || defined(__arm__) || defined(_M_ARM)