summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan White <jwhite@tungstengraphics.com>2008-06-05 15:07:03 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-06-05 15:07:03 -0600
commitfe1a2d1fffe69018e30158ee21ed9842384fd233 (patch)
treed8a401f3743411adfc14438f1f500fd65b4a737c
parentb11aad2abe167716b7ff1262f5872d4d9dbb5b9c (diff)
egl: assorted fixes for Windows
Note that int32_t is typedef'd both in p_compiler.h and eglplatform.h
-rw-r--r--SConstruct1
-rw-r--r--include/EGL/eglplatform.h20
-rw-r--r--include/GLES/glplatform.h2
-rw-r--r--src/gallium/include/pipe/p_compiler.h2
4 files changed, 21 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 549ff647eac..8c8a82b38ec 100644
--- 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 3d71910e5f9..2759a537a0d 100644
--- 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 56b3abcbe03..afbec74ea5f 100644
--- 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 b14260dd901..521ef2d189b 100644
--- 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;