egl: assorted fixes for Windows

Note that int32_t is typedef'd both in p_compiler.h and eglplatform.h

diff --git a/SConstruct b/SConstruct
index 549ff647eaccd2954f519f2dbd1740912de596df..8c8a82b38ec9725e7a0937bb487162066b5fdf40 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -52,6 +52,7 @@ opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
                      ['xlib', 'intel', 'gdi'])) 
 
 env = Environment(
+       MSVS_VERSION = '7.1',
        options = opts, 
        ENV = os.environ)
 Help(opts.GenerateHelpText(env))

diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
index 3d71910e5f97f2330003f8051a5003df5eb3ce8c..2759a537a0d8e729c84ca27bbe4b4d8e113aa28c 100644 (file)
--- a/include/EGL/eglplatform.h
+++ b/include/EGL/eglplatform.h
@@ -6,8 +6,10 @@
 #define __eglplatform_h_
 
 /* Windows calling convention boilerplate */
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
+#if (defined(WIN32) || defined(_WIN32_WCE))
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN            // Exclude rarely-used stuff from Windows headers
+#endif
 #include <windows.h>
 #endif
 
@@ -47,6 +49,18 @@
        etc.
  */
 
+
+#if (defined(WIN32) || defined(_WIN32_WCE))
+
+/** BEGIN Added for Windows **/
+typedef long   int32_t;
+typedef HDC            NativeDisplayType;
+typedef HWND   NativeWindowType;
+typedef HBITMAP NativePixmapType;
+/** END Added for Windows **/
+
+#elif defined(__gnu_linux__)
+
 /** BEGIN Added for X (Mesa) **/
 #include <X11/Xlib.h>
 typedef Display *NativeDisplayType;
@@ -54,6 +68,8 @@ typedef Window NativeWindowType;
 typedef Pixmap NativePixmapType;
 /** END Added for X (Mesa) **/
 
+#endif
+
 /* EGL 1.2 types, renamed for consistency in EGL 1.3 */
 typedef NativeDisplayType EGLNativeDisplayType;
 typedef NativePixmapType EGLNativePixmapType;

diff --git a/include/GLES/glplatform.h b/include/GLES/glplatform.h
index 56b3abcbe03551ac67884f94a7a4161b45dfa09e..afbec74ea5f5b4314c10643ed450c907ed44fe6e 100644 (file)
--- a/include/GLES/glplatform.h
+++ b/include/GLES/glplatform.h
@@ -45,9 +45,7 @@ extern "C" {
  * Definition of GL_API and GL_APIENTRY
  *-----------------------------------------------------------------------*/
 
-#if defined(AEE_SIMULATOR)
 #define __GL_EXPORTS
-#endif
 
 #ifdef _WIN32
 #   ifdef __GL_EXPORTS

diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index b14260dd9012229260e40531fcfff42482c20e18..521ef2d189b547f2f7927e57bd423a6affb0d6ea 100644 (file)
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -58,7 +58,9 @@ typedef __int8             int8_t;
 typedef unsigned __int8    uint8_t;
 typedef __int16            int16_t;
 typedef unsigned __int16   uint16_t;
+#ifndef __eglplatform_h_
 typedef __int32            int32_t;
+#endif
 typedef unsigned __int32   uint32_t;
 typedef __int64            int64_t;
 typedef unsigned __int64   uint64_t;