mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-30 21:30:04 +00:00 
			
		
		
		
	Merge pull request #3535 from ccawley2011/emu_arch_bits
CMake: Set EMU_ARCH_BITS in CMakeLists.txt
This commit is contained in:
		
						commit
						d03f72eb56
					
				
					 4 changed files with 2 additions and 36 deletions
				
			
		|  | @ -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" | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue