Common: Remove now-unused EMU_PLATFORM define, fixes issue #373.
This commit is contained in:
parent
82718c4a41
commit
ce0cfd62d9
@ -18,10 +18,6 @@
|
|||||||
#include "common/platform.h"
|
#include "common/platform.h"
|
||||||
#include "common/scope_exit.h"
|
#include "common/scope_exit.h"
|
||||||
|
|
||||||
#if EMU_PLATFORM == PLATFORM_LINUX
|
|
||||||
#include <unistd.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "bootmanager.h"
|
#include "bootmanager.h"
|
||||||
#include "hotkeys.h"
|
#include "hotkeys.h"
|
||||||
|
|
||||||
|
@ -24,39 +24,9 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common/common_types.h"
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Platform definitions
|
|
||||||
|
|
||||||
/// Enumeration for defining the supported platforms
|
|
||||||
#define PLATFORM_NULL 0
|
|
||||||
#define PLATFORM_WINDOWS 1
|
|
||||||
#define PLATFORM_MACOSX 2
|
|
||||||
#define PLATFORM_LINUX 3
|
|
||||||
#define PLATFORM_ANDROID 4
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// Platform detection
|
// Platform detection
|
||||||
|
|
||||||
#ifndef EMU_PLATFORM
|
|
||||||
|
|
||||||
#if defined( __WIN32__ ) || defined( _WIN32 )
|
|
||||||
#define EMU_PLATFORM PLATFORM_WINDOWS
|
|
||||||
|
|
||||||
#elif defined( __APPLE__ ) || defined( __APPLE_CC__ )
|
|
||||||
#define EMU_PLATFORM PLATFORM_MACOSX
|
|
||||||
|
|
||||||
#elif defined(__linux__)
|
|
||||||
#define EMU_PLATFORM PLATFORM_LINUX
|
|
||||||
|
|
||||||
#else // Assume linux otherwise
|
|
||||||
#define EMU_PLATFORM PLATFORM_LINUX
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__)
|
#if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__)
|
||||||
#define EMU_ARCH_BITS 64
|
#define EMU_ARCH_BITS 64
|
||||||
#elif defined(__i386) || defined(_M_IX86) || defined(__arm__) || defined(_M_ARM)
|
#elif defined(__i386) || defined(_M_IX86) || defined(__arm__) || defined(_M_ARM)
|
||||||
|
Loading…
Reference in New Issue
Block a user