diff options
Diffstat (limited to 'project/dclib/dclib-system.h')
| -rw-r--r-- | project/dclib/dclib-system.h | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/project/dclib/dclib-system.h b/project/dclib/dclib-system.h index e5a7380..e1f8264 100644 --- a/project/dclib/dclib-system.h +++ b/project/dclib/dclib-system.h @@ -44,10 +44,11 @@ typedef enum enumSystemID SYSID_UNKNOWN = 0x00000000, SYSID_I386 = 0x01000000, SYSID_X86_64 = 0x02000000, - SYSID_CYGWIN = 0x03000000, - SYSID_APPLE = 0x04000000, - SYSID_LINUX = 0x05000000, - SYSID_UNIX = 0x06000000, + SYSID_CYGWIN32 = 0x03000000, + SYSID_CYGWIN64 = 0x04000000, + SYSID_APPLE = 0x05000000, + SYSID_LINUX = 0x06000000, + SYSID_UNIX = 0x07000000, } enumSystemID; @@ -56,29 +57,39 @@ typedef enum enumSystemID #undef SYSTEM_LINUX #ifdef __CYGWIN__ - #define SYSTEM "cygwin" - #define SYSTEMID SYSID_CYGWIN + #define SYSTEM "cygwin" + #ifdef __x86_64 + #define SYSTEM2 "cygwin64" + #define SYSTEMID SYSID_CYGWIN64 + #else + #define SYSTEM2 "cygwin32" + #define SYSTEMID SYSID_CYGWIN32 + #endif #elif __APPLE__ - #define SYSTEM "mac" - #define SYSTEMID SYSID_APPLE + #define SYSTEM "mac" + #define SYSTEMID SYSID_APPLE #elif __linux__ #define SYSTEM_LINUX 1 #ifdef __i386__ - #define SYSTEM "i386" - #define SYSTEMID SYSID_I386 + #define SYSTEM "i386" + #define SYSTEMID SYSID_I386 #elif __x86_64__ - #define SYSTEM "x86_64" - #define SYSTEMID SYSID_X86_64 + #define SYSTEM "x86_64" + #define SYSTEMID SYSID_X86_64 #else - #define SYSTEM "linux" - #define SYSTEMID SYSID_LINUX + #define SYSTEM "linux" + #define SYSTEMID SYSID_LINUX #endif #elif __unix__ - #define SYSTEM "unix" - #define SYSTEMID SYSID_UNIX + #define SYSTEM "unix" + #define SYSTEMID SYSID_UNIX #else - #define SYSTEM "unknown" - #define SYSTEMID SYSID_UNKNOWN + #define SYSTEM "unknown" + #define SYSTEMID SYSID_UNKNOWN +#endif + +#ifndef SYSTEM2 + #define SYSTEM2 SYSTEM #endif /////////////////////////////////////////////////////////////////////////////// @@ -87,11 +98,13 @@ static inline void dclibPrintSystem ( FILE * f ) { fprintf(f, "SYSTEM\t\t:= %s\n" + "SYSTEM2\t\t:= %s\n" "SYSTEMID\t:= 0x%x\n" #ifdef SYSTEM_LINUX "SYSTEM_LINUX\t:= 1\n" #endif ,SYSTEM + ,SYSTEM2 ,SYSTEMID ); } |