diff options
| author | Thomas Grill <xovo@users.sourceforge.net> | 2005-03-12 04:56:36 +0000 |
|---|---|---|
| committer | Thomas Grill <xovo@users.sourceforge.net> | 2005-03-12 04:56:36 +0000 |
| commit | 42a820099a1c03b6f0a84e4f16cb983c69309aa5 (patch) | |
| tree | c466e6d1fb56662f5dadcb4cc7f24605ffdcefae /externals/grill/flext/source/flprefix.h | |
| parent | 27da08004c5f024a0f35e3cb4c2b3942548ebcfa (diff) | |
macros for 64-bit architectures
fixes for icc@linux
fixes for attribute editor (to deal with large dialogs)
fix lines on box text change
fix for gcc strangeness
no more static assignment of symbols (problems with Metrowerks)
fixed bugs in SIMD code for non-power-of-2 lengths
fixed shared library versioning
lock-free thread management
don't depend on ldconfig begin in the system path (should be in /sbin/..)
fixed flext::Timer::At method
new lock-free lifo and fifo
svn path=/trunk/; revision=2619
Diffstat (limited to 'externals/grill/flext/source/flprefix.h')
| -rwxr-xr-x | externals/grill/flext/source/flprefix.h | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/externals/grill/flext/source/flprefix.h b/externals/grill/flext/source/flprefix.h index ab09390e..faaa67b9 100755 --- a/externals/grill/flext/source/flprefix.h +++ b/externals/grill/flext/source/flprefix.h @@ -66,10 +66,16 @@ WARRANTIES, see the file, "license.txt," in this distribution. // --- definitions for FLEXT_CPU --------------------- #define FLEXT_CPU_UNKNOWN 0 -#define FLEXT_CPU_INTEL 1 -#define FLEXT_CPU_PPC 2 -#define FLEXT_CPU_MIPS 3 -#define FLEXT_CPU_ALPHA 4 +#define FLEXT_CPU_IA32 1 +#define FLEXT_CPU_PPC 2 +#define FLEXT_CPU_MIPS 3 +#define FLEXT_CPU_ALPHA 4 + +#define FLEXT_CPU_IA64 5 // Itanium +#define FLEXT_CPU_X86_64 6 // AMD-K8, EMT64 + +// compatibility +#define FLEXT_CPU_INTEL FLEXT_CPU_IA32 // --- definitions for FLEXT_THREADS ----------------- #define FLEXT_THR_POSIX 1 // pthreads @@ -110,8 +116,12 @@ WARRANTIES, see the file, "license.txt," in this distribution. // and Intel C++ (as guessed) #ifndef FLEXT_CPU - #if defined(_M_IX86) - #define FLEXT_CPU FLEXT_CPU_INTEL + #if defined(_M_AMD64) + #define FLEXT_CPU FLEXT_CPU_X86_64 + #elif defined(_M_IA64) + #define FLEXT_CPU FLEXT_CPU_IA64 + #elif defined(_M_IX86) + #define FLEXT_CPU FLEXT_CPU_IA32 #elif defined(_M_PPC) #define FLEXT_CPU FLEXT_CPU_PPC #elif defined(_M_MRX000) @@ -124,7 +134,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. #endif #ifndef FLEXT_OS - #if defined(_WIN32) + #if defined(_WIN32) || defined(_WIN64) #define FLEXT_OS FLEXT_OS_WIN #define FLEXT_OSAPI FLEXT_OSAPI_WIN_NATIVE #else @@ -211,8 +221,10 @@ WARRANTIES, see the file, "license.txt," in this distribution. // and Intel (as suggested by Tim Blechmann) #ifndef FLEXT_CPU - #if defined(_X86_) || defined(__i386__) || defined(__i586__) || defined(__i686__) - #define FLEXT_CPU FLEXT_CPU_INTEL + #if defined(_X86_64_) // not sure about this one + #define FLEXT_CPU FLEXT_CPU_X86_64 + #elif defined(_X86_) || defined(__i386__) || defined(__i586__) || defined(__i686__) + #define FLEXT_CPU FLEXT_CPU_IA32 #elif defined(__POWERPC__) #define FLEXT_CPU FLEXT_CPU_PPC #elif defined(__MIPS__) |