From 0b3d1b1ea44791068e8c3dc88549c798fb5e0ea8 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 24 Jun 2008 13:00:03 +0900
Subject: mesa: WGL is not part of the WinCE API.

Although it would be interesting having the GDI winsys running on WinCE
several Windows GDI API functions and data structures are missing from
WinCE headers, making this far from a trivial endeavor.
---
 include/GL/gl.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'include/GL/gl.h')

diff --git a/include/GL/gl.h b/include/GL/gl.h
index 09195aa136..c0cebec2ef 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -88,8 +88,9 @@
 #include <windows.h>
 #endif
 
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) \
-     && !defined(OPENSTEP) && !defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_WIN32_WCE) \
+     && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) \
+     && !defined(__CYGWIN__) || defined(__MINGW32__)
 #include <GL/mesa_wgl.h>
 #endif
 
-- 
cgit v1.2.3


From e4f3770690129dc1ea683fadbe07f1fbc49cf271 Mon Sep 17 00:00:00 2001
From: Jonathan White <jwhite@tungstengraphics.com>
Date: Wed, 16 Jul 2008 16:10:57 -0600
Subject: mesa: WinCE fixes

---
 include/GL/gl.h             | 2 +-
 include/GLES/glplatform.h   | 6 +++++-
 include/GLES2/gl2platform.h | 6 +++++-
 scons/gallium.py            | 8 ++++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'include/GL/gl.h')

diff --git a/include/GL/gl.h b/include/GL/gl.h
index c0cebec2ef..c9ef6136fa 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -58,7 +58,7 @@
 #  else /* for use with static link lib build of Win32 edition only */
 #    define GLAPI extern
 #  endif /* _STATIC_MESA support */
-#  if defined(__MINGW32__) && defined(GL_NO_STDCALL)  /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */
+#  if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE)  /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */
 #    define GLAPIENTRY 
 #  else
 #    define GLAPIENTRY __stdcall
diff --git a/include/GLES/glplatform.h b/include/GLES/glplatform.h
index dbbf2b9194..6e725b18a9 100644
--- a/include/GLES/glplatform.h
+++ b/include/GLES/glplatform.h
@@ -51,7 +51,11 @@ extern "C" {
 #   else
 #       define GL_API __declspec(dllimport)
 #   endif
-#   define GL_APIENTRY __stdcall
+#   ifdef UNDER_CE
+#       define GL_APIENTRY
+#   else
+#       define GL_APIENTRY __stdcall
+#   endif
 #else
 #   ifdef __GL_EXPORTS
 #       define GL_API
diff --git a/include/GLES2/gl2platform.h b/include/GLES2/gl2platform.h
index 348daea765..7891a61ed7 100644
--- a/include/GLES2/gl2platform.h
+++ b/include/GLES2/gl2platform.h
@@ -51,7 +51,11 @@ extern "C" {
 #   else
 #       define GL_APICALL __declspec(dllimport)
 #   endif
-#   define GL_APIENTRY __stdcall
+#   ifdef UNDER_CE
+#       define GL_APIENTRY
+#   else
+#       define GL_APIENTRY __stdcall
+#   endif
 #else
 #   ifdef __GL_EXPORTS
 #       define GL_APICALL
diff --git a/scons/gallium.py b/scons/gallium.py
index 62030f0ab7..75225c97c7 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -338,6 +338,7 @@ def generate(env):
 		if platform == 'wince':
 			# See also C:\WINCE600\public\common\oak\misc\makefile.def
 			cflags += [
+				'/Zl', # omit default library name in .OBJ
 				'/GF', # enable read-only string pooling
 				'/GR-', # disable C++ RTTI
 				'/GS', # enable security checks
@@ -400,6 +401,13 @@ def generate(env):
 			
 			'/entry:DrvEnableDriver',
 		]
+	if platform == 'wince':
+		linkflags += [
+			'/nodefaultlib',
+#			'/incremental:no',
+#			'/fullbuild',
+			'/entry:_DllMainCRTStartup',
+		]
 		if env['profile']:
 			linkflags += [
 				'/MAP', # http://msdn.microsoft.com/en-us/library/k7xkk3e2.aspx
-- 
cgit v1.2.3