ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #702 from lioncash/netplay-version 

Common: State OS instead of 32/64 bit in the netplay lobby
This commit is contained in:
Lioncash 2014-08-01 22:51:30 -04:00
parent 44f751f752 22e9d6977b
commit 77c2b6829a
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Common/Version.cpp
View File

@ -24,24 +24,12 @@ const char *scm_rev_str = "Dolphin "
BUILD_TYPE_STR SCM_DESC_STR; BUILD_TYPE_STR SCM_DESC_STR;
#endif #endif
#if _M_X86_64
#define NP_ARCH "x64"
#elif _M_ARM_32
#define NP_ARCH "ARM32"
#elif _M_ARM_64
#define NP_ARCH "ARM64"
#elif _M_X86_32
#define NP_ARCH "x86"
#else
#define NP_ARCH "Unk"
#endif
#ifdef _WIN32 #ifdef _WIN32
const char *netplay_dolphin_ver = SCM_DESC_STR " W" NP_ARCH; const char *netplay_dolphin_ver = SCM_DESC_STR " Win";
#elif __APPLE__ #elif __APPLE__
const char *netplay_dolphin_ver = SCM_DESC_STR " M" NP_ARCH; const char *netplay_dolphin_ver = SCM_DESC_STR " Mac";
#else #else
const char *netplay_dolphin_ver = SCM_DESC_STR " L" NP_ARCH; const char *netplay_dolphin_ver = SCM_DESC_STR " Lin";
#endif #endif
const char *scm_rev_git_str = SCM_REV_STR; const char *scm_rev_git_str = SCM_REV_STR;