From b24219e6ab0ce96f0d60f7a5f122c52b2c7e40aa Mon Sep 17 00:00:00 2001
From: Thomas Grill <xovo@users.sourceforge.net>
Date: Sat, 19 Jul 2003 02:41:33 +0000
Subject:  ""

svn path=/trunk/; revision=778
---
 externals/grill/flext/source/flprefix.h | 55 ++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 11 deletions(-)

(limited to 'externals/grill/flext/source/flprefix.h')

diff --git a/externals/grill/flext/source/flprefix.h b/externals/grill/flext/source/flprefix.h
index 2399eef5..4d34a975 100755
--- a/externals/grill/flext/source/flprefix.h
+++ b/externals/grill/flext/source/flprefix.h
@@ -54,9 +54,15 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 
 // --- definitions for FLEXT_OS_API ---------------------
 #define FLEXT_OSAPI_UNKNOWN	0
-#define FLEXT_OSAPI_MAC_CLASSIC 1
-#define FLEXT_OSAPI_MAC_CARBON 2
-#define FLEXT_OSAPI_MAC_OSX 3
+
+#define FLEXT_OSAPI_UNIX_POSIX 1
+
+#define FLEXT_OSAPI_MAC_CLASSIC 2
+#define FLEXT_OSAPI_MAC_CARBON 3
+#define FLEXT_OSAPI_MAC_OSX 4
+
+#define FLEXT_OSAPI_WIN_NATIVE 5  // WIN32 Platform
+#define FLEXT_OSAPI_WIN_POSIX 6	   // POSIX API (e.g. cygwin)
 
 // --- definitions for FLEXT_CPU ---------------------
 #define FLEXT_CPU_UNKNOWN	0
@@ -120,12 +126,13 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 	#ifndef FLEXT_OS
 		#if defined(_WIN32)
 			#define FLEXT_OS FLEXT_OS_WIN
+			#define FLEXT_OSAPI FLEXT_OSAPI_WIN_NATIVE
 		#else
 			#define FLEXT_OS FLEXT_OS_UNKNOWN
+			#define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN
 		#endif
 	#endif
 
-	#define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN
 
 #elif defined(__BORLANDC__) 
 	// Borland C++
@@ -135,9 +142,11 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 	#endif
 	#ifndef FLEXT_OS
 		#define FLEXT_OS FLEXT_OS_WIN
+		#define FLEXT_OSAPI FLEXT_OSAPI_WIN_NATIVE
+	#else	
+		#define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN
 	#endif
 
-	#define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN
 
 #elif defined(__MWERKS__)
 	// Metrowerks CodeWarrior
@@ -224,14 +233,21 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 		#endif
 	#endif
 
-	#if FLEXT_OS == FLEXT_OS_MAC
-		#define FLEXT_OSAPI FLEXT_OSAPI_MAC_OSX
-	#else
-		#define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN
+	#ifndef FLEXT_OSAPI
+		#if FLEXT_OS == FLEXT_OS_MAC
+			#define FLEXT_OSAPI FLEXT_OSAPI_MAC_OSX
+		#elif FLEXT_OS == FLEXT_OS_WIN
+			#define FLEXT_OSAPI FLEXT_OSAPI_WIN_POSIX
+		#elif FLEXT_OS == FLEXT_OS_LINUX || FLEXT_OS == FLEXT_OS_IRIX
+			#define FLEXT_OSAPI FLEXT_OSAPI_UNIX_POSIX
+		#else
+			#define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN
+		#endif
 	#endif
 
 #elif defined(__MRC__) && defined(MPW_CPLUS)
 	// Apple MPW MrCpp
+
 	#if __MRC__ < 0x500
 		#error Apple MPW MrCpp v.5.0.0 or better compiler required
 	#endif
@@ -252,10 +268,17 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 		#endif
 	#endif
 
-	#define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN
-
+	#ifndef FLEXT_OSAPI
+		#if FLEXT_OS == FLEXT_OS_MAC
+			#define FLEXT_OSAPI FLEXT_OSAPI_MAC_CLASSIC
+		#else
+			#define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN
+		#endif
+	#endif
 #endif
 
+
+
 #if FLEXT_OS == FLEXT_OS_WIN
 //	#pragma message("Compiling for Windows")
 
@@ -334,6 +357,16 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 	#endif
 #endif
 
+// ----- macros for class names -----
+#if defined(FLEXT_SHARED)
+	#define FLEXT_CLASSDEF(CL) CL##_shared
+#elif defined(FLEXT_THREADS)
+	#define FLEXT_CLASSDEF(CL) CL##_multi
+#else
+	#define FLEXT_CLASSDEF(CL) CL##_single
+#endif
+
+
 // std namespace
 #ifdef __MWERKS__
 #define STD std
-- 
cgit v1.2.1