mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-25 07:01:39 +02:00
Code Issues Projects Releases Wiki Activity

- updated platform id strings

Browse Source
This commit is contained in:
Mark Vejvoda
2012-10-27 22:38:14 +00:00
parent 4dc9dd7a27
commit 604ee7f7be
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/glest_game/facilities/game_util.cpp
View File

@@ -47,7 +47,7 @@ string getPlatformNameString() {
#if defined(WIN32) #if defined(WIN32)
#if defined(__MINGW32__) #if defined(__MINGW32__)
platform = "W-MINGW"; platform = "W-Ming32";
#else #else
platform = "Windows"; platform = "Windows";
#endif #endif
@@ -64,20 +64,18 @@ string getPlatformNameString() {
#elif defined(_AIX) #elif defined(_AIX)
platform = "AIX"; platform = "AIX";
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
platform = "ANDROID"; platform = "Android";
#elif defined(__BEOS__)
platform = "BEOS";
#elif defined(__BEOS__) #elif defined(__BEOS__)
platform = "BEOS"; platform = "BEOS";
#elif defined(__gnu_linux__) #elif defined(__gnu_linux__)
platform = "GNU_LINUX"; platform = "Linux";
#elif defined(__sun) #elif defined(__sun)
platform = "SOLARIS"; platform = "Solaris";
#elif defined(__GNUC__) #elif defined(__GNUC__)
#if defined(__MINGW32__) #if defined(__MINGW32__)
platform = "L-MINGW"; platform = "L-Ming32";
#else #else
platform = "GNU"; platform = "GNU";
#endif #endif
@@ -87,19 +85,19 @@ string getPlatformNameString() {
#endif #endif
#if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__) || defined(_WIN64) #if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__) || defined(_WIN64)
platform += "_x64"; platform += "-X64";
#elif defined(_M_ALPHA) || defined(__alpha__) #elif defined(_M_ALPHA) || defined(__alpha__)
platform += "_ALPHA"; platform += "-ALPHA";
#elif defined(_M_IA64) || defined(__ia64__) #elif defined(_M_IA64) || defined(__ia64__)
platform += "_IA64"; platform += "-IA64";
#elif defined(_M_MRX000) || defined(__mips__) #elif defined(_M_MRX000) || defined(__mips__)
platform += "_MIPS"; platform += "-MIPS";
#elif defined(_M_PPC) || defined(__powerpc__) #elif defined(_M_PPC) || defined(__powerpc__)
platform += "_POWERPC"; platform += "-POWERPC";
#elif defined(__sparc__) #elif defined(__sparc__)
platform += "_SPARC"; platform += "-SPARC";
#elif defined(_M_ARM_FP) || defined(__arm__) || defined(_M_ARM) #elif defined(_M_ARM_FP) || defined(__arm__) || defined(_M_ARM)
platform += "_ARM"; platform += "-ARM";
#endif #endif
} }

2
source/glest_game/main/main.cpp
View File

@@ -3139,7 +3139,7 @@ int glestMain(int argc, char** argv) {
if(hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_CURL_INFO]) == true) { if(hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_CURL_INFO]) == true) {
curl_version_info_data *curlVersion= curl_version_info(CURLVERSION_NOW); curl_version_info_data *curlVersion= curl_version_info(CURLVERSION_NOW);
printf("CURL version: %s [%s] SSL enabled: %d\n", curlVersion->version,(curlVersion->ssl_version != NULL ? curlVersion->ssl_version : ""),(curlVersion->features & CURL_VERSION_SSL == CURL_VERSION_SSL ? true : false)); printf("CURL version: %s [%s] SSL enabled: %d\n", curlVersion->version,(curlVersion->ssl_version != NULL ? curlVersion->ssl_version : ""),((curlVersion->features & CURL_VERSION_SSL) == CURL_VERSION_SSL ? true : false));
if(curlVersion->protocols != NULL && curlVersion->protocols[0] != NULL) { if(curlVersion->protocols != NULL && curlVersion->protocols[0] != NULL) {
printf("protocols: "); printf("protocols: ");
for(unsigned int i = 0; curlVersion->protocols != NULL && curlVersion->protocols[i] != NULL; ++i) { for(unsigned int i = 0; curlVersion->protocols != NULL && curlVersion->protocols[i] != NULL; ++i) {