Versioning:
- Detect more processor architectures - Detect more compilers and report their version numbers - Minor code cleanup
This commit is contained in:
rogerman
parent
9f1a392803
commit
9f1744e2a3
|
|
@ -18,27 +18,44 @@
|
|||
#include "types.h"
|
||||
#include "version.h"
|
||||
|
||||
// Helper macros to convert numerics to strings
|
||||
#if defined(_MSC_VER)
|
||||
//re: http://72.14.203.104/search?q=cache:HG-okth5NGkJ:mail.python.org/pipermail/python-checkins/2002-November/030704.html+_msc_ver+compiler+version+string&hl=en&gl=us&ct=clnk&cd=5
|
||||
#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
|
||||
#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
|
||||
#define _Py_STRINGIZE2(X) #X
|
||||
|
||||
#define TOSTRING(X) _Py_STRINGIZE(X) // Alias _Py_STRINGIZE so that we have a common macro name
|
||||
#else
|
||||
#define STRINGIFY(x) #x
|
||||
#define TOSTRING(x) STRINGIFY(x)
|
||||
#endif
|
||||
|
||||
//todo - everyone will want to support this eventually, i suppose
|
||||
#if defined(_WINDOWS) && !defined(WXPORT)
|
||||
#include "svnrev.h"
|
||||
#include "svnrev.h"
|
||||
#else
|
||||
#ifdef SVN_REV
|
||||
#define SVN_REV_STR SVN_REV
|
||||
#else
|
||||
#define SVN_REV_STR ""
|
||||
#endif
|
||||
#ifdef SVN_REV
|
||||
#define SVN_REV_STR SVN_REV
|
||||
#else
|
||||
#define SVN_REV_STR ""
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define DESMUME_NAME "DeSmuME"
|
||||
|
||||
#ifdef _WIN64
|
||||
#define DESMUME_PLATFORM_STRING " x64"
|
||||
#if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_WIN64)
|
||||
#define DESMUME_PLATFORM_STRING " x64"
|
||||
#elif defined(__i386__) || defined(_M_IX86) || defined(_WIN32)
|
||||
#define DESMUME_PLATFORM_STRING " x86"
|
||||
#elif defined(__arm__)
|
||||
#define DESMUME_PLATFORM_STRING " ARM"
|
||||
#elif defined(__thumb__)
|
||||
#define DESMUME_PLATFORM_STRING " ARM-Thumb"
|
||||
#elif defined(__ppc__) || defined(_M_PPC)
|
||||
#define DESMUME_PLATFORM_STRING " PowerPC"
|
||||
#else
|
||||
#ifdef _WIN32
|
||||
#define DESMUME_PLATFORM_STRING " x86"
|
||||
#else
|
||||
#define DESMUME_PLATFORM_STRING ""
|
||||
#endif
|
||||
#define DESMUME_PLATFORM_STRING ""
|
||||
#endif
|
||||
|
||||
#ifndef ENABLE_SSE2
|
||||
|
|
@ -48,47 +65,56 @@
|
|||
#define DESMUME_CPUEXT_STRING " NOSSE2"
|
||||
#endif
|
||||
#else
|
||||
#define DESMUME_CPUEXT_STRING ""
|
||||
#define DESMUME_CPUEXT_STRING ""
|
||||
#endif
|
||||
|
||||
#ifdef DEVELOPER
|
||||
#define DESMUME_FEATURE_STRING " dev+"
|
||||
#define DESMUME_FEATURE_STRING " dev+"
|
||||
#else
|
||||
#define DESMUME_FEATURE_STRING ""
|
||||
#define DESMUME_FEATURE_STRING ""
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG
|
||||
#define DESMUME_SUBVERSION_STRING " debug"
|
||||
#define DESMUME_SUBVERSION_STRING " debug"
|
||||
#elif defined(PUBLIC_RELEASE)
|
||||
#define DESMUME_SUBVERSION_STRING ""
|
||||
#define DESMUME_SUBVERSION_STRING ""
|
||||
#else
|
||||
#define DESMUME_SUBVERSION_STRING " svn" SVN_REV_STR
|
||||
#define DESMUME_SUBVERSION_STRING " svn" SVN_REV_STR
|
||||
#endif
|
||||
|
||||
#ifdef __INTEL_COMPILER
|
||||
#define DESMUME_COMPILER " (Intel) "
|
||||
#define DESMUME_COMPILER_DETAIL " (Intel) "
|
||||
#define DESMUME_COMPILER " (Intel)"
|
||||
#define DESMUME_COMPILER_DETAIL " (Intel v" TOSTRING(__INTEL_COMPILER) ")"
|
||||
#elif defined(_MSC_VER)
|
||||
#define DESMUME_COMPILER ""
|
||||
#define DESMUME_COMPILER_DETAIL " msvc " _Py_STRINGIZE(_MSC_VER)
|
||||
#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
|
||||
#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
|
||||
#define _Py_STRINGIZE2(X) #X
|
||||
//re: http://72.14.203.104/search?q=cache:HG-okth5NGkJ:mail.python.org/pipermail/python-checkins/2002-November/030704.html+_msc_ver+compiler+version+string&hl=en&gl=us&ct=clnk&cd=5
|
||||
#define DESMUME_COMPILER " (MSVC)"
|
||||
#define DESMUME_COMPILER_DETAIL " (MSVC v" TOSTRING(_MSC_VER) ")"
|
||||
#elif defined(__clang__)
|
||||
#define DESMUME_COMPILER " (LLVM-Clang)"
|
||||
#define DESMUME_COMPILER_DETAIL " (LLVM-Clang v" TOSTRING(__clang_major__) "." TOSTRING(__clang_minor__) "." TOSTRING(__clang_patchlevel__) ")"
|
||||
#elif defined(__llvm__)
|
||||
#define DESMUME_COMPILER " (LLVM)"
|
||||
#define DESMUME_COMPILER_DETAIL " (LLVM)"
|
||||
#elif defined(__GNUC__) // Always make GCC the last check, since other compilers, such as Clang, may define __GNUC__ internally.
|
||||
#define DESMUME_COMPILER " (GCC)"
|
||||
|
||||
#if defined(__GNUC_PATCHLEVEL__)
|
||||
#define DESMUME_COMPILER_DETAIL " (GCC v" TOSTRING(__GNUC__) "." TOSTRING(__GNUC_MINOR__) "." TOSTRING(__GNUC_PATCHLEVEL__) ")"
|
||||
#else
|
||||
#define DESMUME_COMPILER_DETAIL " (GCC v" TOSTRING(__GNUC__) "." TOSTRING(__GNUC_MINOR__) ")"
|
||||
#endif
|
||||
#else
|
||||
// TODO: make for others compilers
|
||||
#define DESMUME_COMPILER ""
|
||||
#define DESMUME_COMPILER_DETAIL ""
|
||||
#define DESMUME_COMPILER ""
|
||||
#define DESMUME_COMPILER_DETAIL ""
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_JIT
|
||||
#define DESMUME_JIT "-JIT"
|
||||
#define DESMUME_JIT "-JIT"
|
||||
#else
|
||||
#define DESMUME_JIT ""
|
||||
#define DESMUME_JIT ""
|
||||
#endif
|
||||
|
||||
#define DESMUME_VERSION_NUMERIC 90900
|
||||
#define DESMUME_VERSION_STRING " " "0.9.9" DESMUME_SUBVERSION_STRING DESMUME_FEATURE_STRING DESMUME_PLATFORM_STRING DESMUME_JIT DESMUME_CPUEXT_STRING DESMUME_COMPILER
|
||||
#define DESMUME_VERSION_STRING " " "0.9.9" DESMUME_SUBVERSION_STRING DESMUME_FEATURE_STRING DESMUME_PLATFORM_STRING DESMUME_JIT DESMUME_CPUEXT_STRING
|
||||
#define DESMUME_NAME_AND_VERSION DESMUME_NAME DESMUME_VERSION_STRING
|
||||
|
||||
u32 EMU_DESMUME_VERSION_NUMERIC() { return DESMUME_VERSION_NUMERIC; }
|
||||
|
|
|
|||
Loading…
Reference in New Issue