diff options
| author | Tim Angus <tim@ngus.net> | 2011-01-24 22:07:34 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:17:54 +0000 |
| commit | f96ae257eab6fae9b4b4f4409c58dbce6915ac35 (patch) | |
| tree | c9828a3c3726d4b260493a710fd1f2f9f7bc6056 /src/qcommon/q_platform.h | |
| parent | a0101a6294268ef392b3fa4ecad12706e6cf4cf3 (diff) | |
* Merge ioq3-r1813
Diffstat (limited to 'src/qcommon/q_platform.h')
| -rw-r--r-- | src/qcommon/q_platform.h | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/src/qcommon/q_platform.h b/src/qcommon/q_platform.h index 9405e749..4d4d2856 100644 --- a/src/qcommon/q_platform.h +++ b/src/qcommon/q_platform.h @@ -73,9 +73,33 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // for windows fastcall option #define QDECL -//================================================================= WIN32 === +//================================================================= WIN64/32 === -#ifdef _WIN32 +#if defined(_WIN64) || defined(__WIN64__) + +#undef QDECL +#define QDECL __cdecl + +#if defined( _MSC_VER ) +#define OS_STRING "win_msvc64" +#elif defined __MINGW64__ +#define OS_STRING "win_mingw64" +#endif + +#define ID_INLINE inline +#define PATH_SEP '\\' + +#if defined( __WIN64__ ) +#define ARCH_STRING "x86_64" +#elif defined _M_ALPHA +#define ARCH_STRING "AXP" +#endif + +#define Q3_LITTLE_ENDIAN + +#define DLL_EXT ".dll" + +#elif defined(_WIN32) || defined(__WIN32__) #undef QDECL #define QDECL __cdecl @@ -120,6 +144,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #elif defined __i386__ #define ARCH_STRING "x86" #define Q3_LITTLE_ENDIAN +#elif defined __x86_64__ +#define ARCH_STRING "x86_64" +#define Q3_LITTLE_ENDIAN #endif #define DLL_EXT ".dylib" @@ -201,7 +228,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifdef __i386__ #define ARCH_STRING "x86" #elif defined __amd64__ -#define ARCH_STRING "x86_64" +#define ARCH_STRING "amd64" #elif defined __axp__ #define ARCH_STRING "alpha" #endif |