gallium: Identify each Windows platform individually from scons.

2 files changed, 35 insertions, 22 deletions

diff --git a/common.py b/common.py
index 8b70e9b4261..b6251d3960d 100644
--- a/common.py
+++ b/common.py
@@ -210,9 +210,11 @@ def generate(env):
 			'TEST_EXPORTS' ,
 		]
 	if platform == 'windows':
-		cppdefines += ['PIPE_SUBSYSTEM_USER']
+		cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_USER']
 	if platform == 'winddk':
-		cppdefines += ['PIPE_SUBSYSTEM_KERNEL']
+		cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_DISPLAY']
+	if platform == 'wince':
+		cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_CE']
 	env.Append(CPPDEFINES = cppdefines)
 
 	# C compiler options
diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h
index d2d2ae16172..af3746c0265 100644
--- a/src/gallium/include/pipe/p_config.h
+++ b/src/gallium/include/pipe/p_config.h
@@ -33,12 +33,13 @@
  * architecture, and operating system being used. These defines should be used 
  * throughout the code to facilitate porting to new platforms. It is likely that 
  * this file is auto-generated by an autoconf-like tool at some point, as some 
- * things cannot be determined by existing defines alone. 
+ * things cannot be determined by pre-defined environment alone. 
  * 
  * See also:
  * - http://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html
  * - echo | gcc -dM -E - | sort
  * - http://msdn.microsoft.com/en-us/library/b0084kay.aspx
+ * 
  * @author José Fonseca <[email protected]>
  */
 
@@ -54,6 +55,15 @@
 #define PIPE_CC_GCC
 #endif
 
+/*
+ * Meaning of _MSC_VER value:
+ * - 1400: Visual C++ 2005
+ * - 1310: Visual C++ .NET 2003
+ * - 1300: Visual C++ .NET 2002
+ * 
+ * __MSC__ seems to be an old macro -- it is not pre-defined on recent MSVC 
+ * versions.
+ */
 #if defined(_MSC_VER) || defined(__MSC__)
 #define PIPE_CC_MSVC
 #endif
@@ -81,7 +91,9 @@
 
 
 /*
- * Operating system
+ * Operating system family.
+ * 
+ * See subsystem below for a more fine-grained distinction.
  */
 
 #if defined(__linux__)
@@ -94,32 +106,31 @@
 
 
 /*
- * Subsystem
+ * Subsystem.
  * 
- * XXX: There is no way to autodetect this.
+ * NOTE: There is no way to auto-detect most of these.
  */
 
 #if defined(PIPE_OS_LINUX)
 #define PIPE_SUBSYSTEM_DRI
-#endif
+#endif /* PIPE_OS_LINUX */
 
 #if defined(PIPE_OS_WINDOWS)
-#ifndef _WIN32_WCE
-#if !defined(PIPE_SUBSYSTEM_USER) && !defined(PIPE_SUBSYSTEM_KERNEL)
-#error Neither PIPE_SUBSYSTEM_USER or PIPE_SUBSYSTEM_KERNEL defined.
-#endif
-#if defined(PIPE_SUBSYSTEM_KERNEL)
-#define PIPE_SUBSYSTEM_WINDOWS_DISPLAY
-#endif
-#if 0 /* FIXME */
-#define PIPE_SUBSYSTEM_WINDOWS_MINIPORT
-#endif
-#if defined(PIPE_SUBSYSTEM_USER)
-#define PIPE_SUBSYSTEM_WINDOWS_USER
-#endif
-#else /* _WIN32_WCE */
+#if defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY)
+/* Windows 2000/XP Display Driver */ 
+#elif defined(PIPE_SUBSYSTEM_WINDOWS_MINIPORT)
+/* Windows 2000/XP Miniport Driver */ 
+#elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
+/* Windows User-space Library */
+#elif defined(PIPE_SUBSYSTEM_WINDOWS_CE)
+/* Windows CE 5.0/6.0 */
+#else
+#ifdef _WIN32_WCE
 #define PIPE_SUBSYSTEM_WINDOWS_CE
-#endif /* _WIN32_WCE */
+#else /* !_WIN32_WCE */
+#error No PIPE_SUBSYSTEM_WINDOWS_xxx subsystem defined. 
+#endif /* !_WIN32_WCE */
+#endif
 #endif /* PIPE_OS_WINDOWS */