mesa: WinCE fixes

diff --git a/include/GL/gl.h b/include/GL/gl.h
index c0cebec2efac3d7dc30d8bbff5504e89864df465..c9ef6136fab32b5ce567e62911713338d99c68f0 100644 (file)
--- 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 dbbf2b91949efa0ddd500ce5af418e7c0539ee4c..6e725b18a9de59471f559c711cea9e07112cbbfe 100644 (file)
--- 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 348daea7656b6c006ca9fd0520dd0c0c7a7c1ef8..7891a61ed7a3a29ae91d81cb5dafa82f265cbd83 100644 (file)
--- 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 62030f0ab7bb4a137dea4fe66757a0d6b4e991b7..75225c97c712512550ca13ba9706dc421ccc3549 100644 (file)
--- 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