OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: WinCE fixes

Browse Source
This commit is contained in:
Jonathan White
2008-07-16 16:10:57 -06:00
committed by Brian Paul
parent ab8f838060
commit e4f3770690
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/GL/gl.h
View File

@@ -58,7 +58,7 @@
# else /* for use with static link lib build of Win32 edition only */ # else /* for use with static link lib build of Win32 edition only */
# define GLAPI extern # define GLAPI extern
# endif /* _STATIC_MESA support */ # 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 # define GLAPIENTRY
# else # else
# define GLAPIENTRY __stdcall # define GLAPIENTRY __stdcall

6
include/GLES/glplatform.h
View File

@@ -51,7 +51,11 @@ extern "C" {
# else # else
# define GL_API __declspec(dllimport) # define GL_API __declspec(dllimport)
# endif # endif
# define GL_APIENTRY __stdcall # ifdef UNDER_CE
# define GL_APIENTRY
# else
# define GL_APIENTRY __stdcall
# endif
#else #else
# ifdef __GL_EXPORTS # ifdef __GL_EXPORTS
# define GL_API # define GL_API

6
include/GLES2/gl2platform.h
View File

@@ -51,7 +51,11 @@ extern "C" {
# else # else
# define GL_APICALL __declspec(dllimport) # define GL_APICALL __declspec(dllimport)
# endif # endif
# define GL_APIENTRY __stdcall # ifdef UNDER_CE
# define GL_APIENTRY
# else
# define GL_APIENTRY __stdcall
# endif
#else #else
# ifdef __GL_EXPORTS # ifdef __GL_EXPORTS
# define GL_APICALL # define GL_APICALL

8
scons/gallium.py
View File

@@ -338,6 +338,7 @@ def generate(env):
if platform == 'wince': if platform == 'wince':
# See also C:\WINCE600\public\common\oak\misc\makefile.def # See also C:\WINCE600\public\common\oak\misc\makefile.def
cflags += [ cflags += [
'/Zl', # omit default library name in .OBJ
'/GF', # enable read-only string pooling '/GF', # enable read-only string pooling
'/GR-', # disable C++ RTTI '/GR-', # disable C++ RTTI
'/GS', # enable security checks '/GS', # enable security checks
@@ -400,6 +401,13 @@ def generate(env):
'/entry:DrvEnableDriver', '/entry:DrvEnableDriver',
] ]
if platform == 'wince':
linkflags += [
'/nodefaultlib',
# '/incremental:no',
# '/fullbuild',
'/entry:_DllMainCRTStartup',
]
if env['profile']: if env['profile']:
linkflags += [ linkflags += [
'/MAP', # http://msdn.microsoft.com/en-us/library/k7xkk3e2.aspx '/MAP', # http://msdn.microsoft.com/en-us/library/k7xkk3e2.aspx