Module: Mesa Branch: master Commit: 65fde5be8bd5e485dd69afc244568f164cf24fa4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=65fde5be8bd5e485dd69afc244568f164cf24fa4
Author: José Fonseca <[email protected]> Date: Thu Feb 19 10:57:11 2009 +0000 wgl: Use a separate .DEF for MinGW gnu linker fails to resolve the @n symbols, unless: - they are listed verbatim in the .def - they are already linked. And mingw's .def parser is slightly incompatible with MSVC in respect with underscores. Will try to work with upstream to fix this, but for now there is no option other to use seperate .def for mingw. --- src/gallium/state_trackers/wgl/opengl32.mingw.def | 387 +++++++++++++++++++++ src/gallium/winsys/gdi/SConscript | 12 +- 2 files changed, 392 insertions(+), 7 deletions(-) diff --git a/src/gallium/state_trackers/wgl/opengl32.mingw.def b/src/gallium/state_trackers/wgl/opengl32.mingw.def new file mode 100644 index 0000000..1f03ea3 --- /dev/null +++ b/src/gallium/state_trackers/wgl/opengl32.mingw.def @@ -0,0 +1,387 @@ +EXPORTS +; GlmfBeginGlsBlock = glmfbeginglsbl...@4 +; GlmfCloseMetaFile = glmfclosemetaf...@4 +; GlmfEndGlsBlock = glmfendglsbl...@4 +; GlmfEndPlayback = glmfendplayb...@4 +; GlmfInitPlayback = glmfinitplayb...@12 +; GlmfPlayGlsRecord = glmfplayglsrec...@16 + glAccum = glac...@8 + glAlphaFunc = glalphaf...@8 + glAreTexturesResident = glaretexturesresid...@12 + glArrayElement = glarrayelem...@4 + glBegin = glbe...@4 + glBindTexture = glbindtext...@8 + glBitmap = glbit...@28 + glBlendFunc = glblendf...@8 + glCallList = glcalll...@4 + glCallLists = glcallli...@12 + glClear = glcl...@4 + glClearAccum = glclearac...@16 + glClearColor = glclearco...@16 + glClearDepth = glclearde...@8 + glClearIndex = glclearin...@4 + glClearStencil = glclearsten...@4 + glClipPlane = glclippl...@8 + glColor3b = glcolo...@12 + glColor3bv = glcolor...@4 + glColor3d = glcolo...@24 + glColor3dv = glcolor...@4 + glColor3f = glcolo...@12 + glColor3fv = glcolor...@4 + glColor3i = glcolo...@12 + glColor3iv = glcolor...@4 + glColor3s = glcolo...@12 + glColor3sv = glcolor...@4 + glColor3ub = glcolor...@12 + glColor3ubv = glcolor3...@4 + glColor3ui = glcolor...@12 + glColor3uiv = glcolor3...@4 + glColor3us = glcolor...@12 + glColor3usv = glcolor3...@4 + glColor4b = glcolo...@16 + glColor4bv = glcolor...@4 + glColor4d = glcolo...@32 + glColor4dv = glcolor...@4 + glColor4f = glcolo...@16 + glColor4fv = glcolor...@4 + glColor4i = glcolo...@16 + glColor4iv = glcolor...@4 + glColor4s = glcolo...@16 + glColor4sv = glcolor...@4 + glColor4ub = glcolor...@16 + glColor4ubv = glcolor4...@4 + glColor4ui = glcolor...@16 + glColor4uiv = glcolor4...@4 + glColor4us = glcolor...@16 + glColor4usv = glcolor4...@4 + glColorMask = glcolorm...@16 + glColorMaterial = glcolormater...@8 + glColorPointer = glcolorpoin...@16 + glCopyPixels = glcopypix...@20 + glCopyTexImage1D = glcopyteximag...@28 + glCopyTexImage2D = glcopyteximag...@32 + glCopyTexSubImage1D = glcopytexsubimag...@24 + glCopyTexSubImage2D = glcopytexsubimag...@32 + glCullFace = glcullf...@4 +; glDebugEntry = gldebugen...@8 + glDeleteLists = gldeleteli...@8 + glDeleteTextures = gldeletetextu...@8 + glDepthFunc = gldepthf...@4 + glDepthMask = gldepthm...@4 + glDepthRange = gldepthra...@16 + glDisable = gldisa...@4 + glDisableClientState = gldisableclientst...@4 + glDrawArrays = gldrawarr...@12 + glDrawBuffer = gldrawbuf...@4 + glDrawElements = gldraweleme...@16 + glDrawPixels = gldrawpix...@20 + glEdgeFlag = gledgef...@4 + glEdgeFlagPointer = gledgeflagpoin...@8 + glEdgeFlagv = gledgefl...@4 + glEnable = glena...@4 + glEnableClientState = glenableclientst...@4 + glEnd = gl...@0 + glEndList = glendl...@0 + glEvalCoord1d = glevalcoor...@8 + glEvalCoord1dv = glevalcoord...@4 + glEvalCoord1f = glevalcoor...@4 + glEvalCoord1fv = glevalcoord...@4 + glEvalCoord2d = glevalcoor...@16 + glEvalCoord2dv = glevalcoord...@4 + glEvalCoord2f = glevalcoor...@8 + glEvalCoord2fv = glevalcoord...@4 + glEvalMesh1 = glevalme...@12 + glEvalMesh2 = glevalme...@20 + glEvalPoint1 = glevalpoi...@4 + glEvalPoint2 = glevalpoi...@8 + glFeedbackBuffer = glfeedbackbuf...@12 + glFinish = glfin...@0 + glFlush = glfl...@0 + glFogf = glf...@8 + glFogfv = glfo...@8 + glFogi = glf...@8 + glFogiv = glfo...@8 + glFrontFace = glfrontf...@4 + glFrustum = glfrus...@48 + glGenLists = glgenli...@4 + glGenTextures = glgentextu...@8 + glGetBooleanv = glgetboole...@8 + glGetClipPlane = glgetclippl...@8 + glGetDoublev = glgetdoub...@8 + glGetError = glgeter...@0 + glGetFloatv = glgetflo...@8 + glGetIntegerv = glgetinteg...@8 + glGetLightfv = glgetligh...@12 + glGetLightiv = glgetligh...@12 + glGetMapdv = glgetma...@12 + glGetMapfv = glgetma...@12 + glGetMapiv = glgetma...@12 + glGetMaterialfv = glgetmateria...@12 + glGetMaterialiv = glgetmateria...@12 + glGetPixelMapfv = glgetpixelma...@8 + glGetPixelMapuiv = glgetpixelmap...@8 + glGetPixelMapusv = glgetpixelmap...@8 + glGetPointerv = glgetpoint...@8 + glGetPolygonStipple = glgetpolygonstip...@4 + glGetString = glgetstr...@4 + glGetTexEnvfv = glgettexen...@12 + glGetTexEnviv = glgettexen...@12 + glGetTexGendv = glgettexge...@12 + glGetTexGenfv = glgettexge...@12 + glGetTexGeniv = glgettexge...@12 + glGetTexImage = glgettexim...@20 + glGetTexLevelParameterfv = glgettexlevelparamete...@16 + glGetTexLevelParameteriv = glgettexlevelparamete...@16 + glGetTexParameterfv = glgettexparamete...@12 + glGetTexParameteriv = glgettexparamete...@12 + glHint = glh...@8 + glIndexMask = glindexm...@4 + glIndexPointer = glindexpoin...@12 + glIndexd = glind...@8 + glIndexdv = glinde...@4 + glIndexf = glind...@4 + glIndexfv = glinde...@4 + glIndexi = glind...@4 + glIndexiv = glinde...@4 + glIndexs = glind...@4 + glIndexsv = glinde...@4 + glIndexub = glinde...@4 + glIndexubv = glindex...@4 + glInitNames = glinitna...@0 + glInterleavedArrays = glinterleavedarr...@12 + glIsEnabled = glisenab...@4 + glIsList = glisl...@4 + glIsTexture = glistext...@4 + glLightModelf = gllightmod...@8 + glLightModelfv = gllightmode...@8 + glLightModeli = gllightmod...@8 + glLightModeliv = gllightmode...@8 + glLightf = gllig...@12 + glLightfv = glligh...@12 + glLighti = gllig...@12 + glLightiv = glligh...@12 + glLineStipple = gllinestip...@8 + glLineWidth = gllinewi...@4 + glListBase = gllistb...@4 + glLoadIdentity = glloadident...@0 + glLoadMatrixd = glloadmatr...@4 + glLoadMatrixf = glloadmatr...@4 + glLoadName = glloadn...@4 + glLogicOp = gllogi...@4 + glMap1d = glma...@32 + glMap1f = glma...@24 + glMap2d = glma...@56 + glMap2f = glma...@40 + glMapGrid1d = glmapgri...@20 + glMapGrid1f = glmapgri...@12 + glMapGrid2d = glmapgri...@40 + glMapGrid2f = glmapgri...@24 + glMaterialf = glmateri...@12 + glMaterialfv = glmateria...@12 + glMateriali = glmateri...@12 + glMaterialiv = glmateria...@12 + glMatrixMode = glmatrixm...@4 + glMultMatrixd = glmultmatr...@4 + glMultMatrixf = glmultmatr...@4 + glNewList = glnewl...@8 + glNormal3b = glnorma...@12 + glNormal3bv = glnormal...@4 + glNormal3d = glnorma...@24 + glNormal3dv = glnormal...@4 + glNormal3f = glnorma...@12 + glNormal3fv = glnormal...@4 + glNormal3i = glnorma...@12 + glNormal3iv = glnormal...@4 + glNormal3s = glnorma...@12 + glNormal3sv = glnormal...@4 + glNormalPointer = glnormalpoin...@12 + glOrtho = glor...@48 + glPassThrough = glpassthro...@4 + glPixelMapfv = glpixelma...@12 + glPixelMapuiv = glpixelmap...@12 + glPixelMapusv = glpixelmap...@12 + glPixelStoref = glpixelsto...@8 + glPixelStorei = glpixelsto...@8 + glPixelTransferf = glpixeltransf...@8 + glPixelTransferi = glpixeltransf...@8 + glPixelZoom = glpixelz...@8 + glPointSize = glpoints...@4 + glPolygonMode = glpolygonm...@8 + glPolygonOffset = glpolygonoff...@8 + glPolygonStipple = glpolygonstip...@4 + glPopAttrib = glpopatt...@0 + glPopClientAttrib = glpopclientatt...@0 + glPopMatrix = glpopmat...@0 + glPopName = glpopn...@0 + glPrioritizeTextures = glprioritizetextu...@12 + glPushAttrib = glpushatt...@4 + glPushClientAttrib = glpushclientatt...@4 + glPushMatrix = glpushmat...@0 + glPushName = glpushn...@4 + glRasterPos2d = glrasterpo...@16 + glRasterPos2dv = glrasterpos...@4 + glRasterPos2f = glrasterpo...@8 + glRasterPos2fv = glrasterpos...@4 + glRasterPos2i = glrasterpo...@8 + glRasterPos2iv = glrasterpos...@4 + glRasterPos2s = glrasterpo...@8 + glRasterPos2sv = glrasterpos...@4 + glRasterPos3d = glrasterpo...@24 + glRasterPos3dv = glrasterpos...@4 + glRasterPos3f = glrasterpo...@12 + glRasterPos3fv = glrasterpos...@4 + glRasterPos3i = glrasterpo...@12 + glRasterPos3iv = glrasterpos...@4 + glRasterPos3s = glrasterpo...@12 + glRasterPos3sv = glrasterpos...@4 + glRasterPos4d = glrasterpo...@32 + glRasterPos4dv = glrasterpos...@4 + glRasterPos4f = glrasterpo...@16 + glRasterPos4fv = glrasterpos...@4 + glRasterPos4i = glrasterpo...@16 + glRasterPos4iv = glrasterpos...@4 + glRasterPos4s = glrasterpo...@16 + glRasterPos4sv = glrasterpos...@4 + glReadBuffer = glreadbuf...@4 + glReadPixels = glreadpix...@28 + glRectd = glre...@32 + glRectdv = glrec...@8 + glRectf = glre...@16 + glRectfv = glrec...@8 + glRecti = glre...@16 + glRectiv = glrec...@8 + glRects = glre...@16 + glRectsv = glrec...@8 + glRenderMode = glrenderm...@4 + glRotated = glrota...@32 + glRotatef = glrota...@16 + glScaled = glsca...@24 + glScalef = glsca...@12 + glScissor = glscis...@16 + glSelectBuffer = glselectbuf...@8 + glShadeModel = glshademo...@4 + glStencilFunc = glstencilf...@12 + glStencilMask = glstencilm...@4 + glStencilOp = glstenci...@12 + glTexCoord1d = gltexcoor...@8 + glTexCoord1dv = gltexcoord...@4 + glTexCoord1f = gltexcoor...@4 + glTexCoord1fv = gltexcoord...@4 + glTexCoord1i = gltexcoor...@4 + glTexCoord1iv = gltexcoord...@4 + glTexCoord1s = gltexcoor...@4 + glTexCoord1sv = gltexcoord...@4 + glTexCoord2d = gltexcoor...@16 + glTexCoord2dv = gltexcoord...@4 + glTexCoord2f = gltexcoor...@8 + glTexCoord2fv = gltexcoord...@4 + glTexCoord2i = gltexcoor...@8 + glTexCoord2iv = gltexcoord...@4 + glTexCoord2s = gltexcoor...@8 + glTexCoord2sv = gltexcoord...@4 + glTexCoord3d = gltexcoor...@24 + glTexCoord3dv = gltexcoord...@4 + glTexCoord3f = gltexcoor...@12 + glTexCoord3fv = gltexcoord...@4 + glTexCoord3i = gltexcoor...@12 + glTexCoord3iv = gltexcoord...@4 + glTexCoord3s = gltexcoor...@12 + glTexCoord3sv = gltexcoord...@4 + glTexCoord4d = gltexcoor...@32 + glTexCoord4dv = gltexcoord...@4 + glTexCoord4f = gltexcoor...@16 + glTexCoord4fv = gltexcoord...@4 + glTexCoord4i = gltexcoor...@16 + glTexCoord4iv = gltexcoord...@4 + glTexCoord4s = gltexcoor...@16 + glTexCoord4sv = gltexcoord...@4 + glTexCoordPointer = gltexcoordpoin...@16 + glTexEnvf = gltexe...@12 + glTexEnvfv = gltexen...@12 + glTexEnvi = gltexe...@12 + glTexEnviv = gltexen...@12 + glTexGend = gltexg...@16 + glTexGendv = gltexge...@12 + glTexGenf = gltexg...@12 + glTexGenfv = gltexge...@12 + glTexGeni = gltexg...@12 + glTexGeniv = gltexge...@12 + glTexImage1D = glteximag...@32 + glTexImage2D = glteximag...@36 + glTexParameterf = gltexparamet...@12 + glTexParameterfv = gltexparamete...@12 + glTexParameteri = gltexparamet...@12 + glTexParameteriv = gltexparamete...@12 + glTexSubImage1D = gltexsubimag...@28 + glTexSubImage2D = gltexsubimag...@36 + glTranslated = gltransla...@24 + glTranslatef = gltransla...@12 + glVertex2d = glverte...@16 + glVertex2dv = glvertex...@4 + glVertex2f = glverte...@8 + glVertex2fv = glvertex...@4 + glVertex2i = glverte...@8 + glVertex2iv = glvertex...@4 + glVertex2s = glverte...@8 + glVertex2sv = glvertex...@4 + glVertex3d = glverte...@24 + glVertex3dv = glvertex...@4 + glVertex3f = glverte...@12 + glVertex3fv = glvertex...@4 + glVertex3i = glverte...@12 + glVertex3iv = glvertex...@4 + glVertex3s = glverte...@12 + glVertex3sv = glvertex...@4 + glVertex4d = glverte...@32 + glVertex4dv = glvertex...@4 + glVertex4f = glverte...@16 + glVertex4fv = glvertex...@4 + glVertex4i = glverte...@16 + glVertex4iv = glvertex...@4 + glVertex4s = glverte...@16 + glVertex4sv = glvertex...@4 + glVertexPointer = glvertexpoin...@16 + glViewport = glviewp...@16 + wglChoosePixelFormat = wglchoosepixelfor...@8 + wglCopyContext = wglcopycont...@12 + wglCreateContext = wglcreatecont...@4 + wglCreateLayerContext = wglcreatelayercont...@8 + wglDeleteContext = wgldeletecont...@4 + wglDescribeLayerPlane = wgldescribelayerpl...@20 + wglDescribePixelFormat = wgldescribepixelfor...@16 + wglGetCurrentContext = wglgetcurrentcont...@0 + wglGetCurrentDC = wglgetcurren...@0 +; wglGetDefaultProcAddress = wglgetdefaultprocaddr...@4 + wglGetLayerPaletteEntries = wglgetlayerpaletteentr...@20 + wglGetPixelFormat = wglgetpixelfor...@4 + wglGetProcAddress = wglgetprocaddr...@4 + wglMakeCurrent = wglmakecurr...@8 + wglRealizeLayerPalette = wglrealizelayerpale...@12 + wglSetLayerPaletteEntries = wglsetlayerpaletteentr...@20 + wglSetPixelFormat = wglsetpixelfor...@12 + wglShareLists = wglshareli...@8 + wglSwapBuffers = wglswapbuff...@4 + wglSwapLayerBuffers = wglswaplayerbuff...@8 +; wglSwapMultipleBuffers = wglswapmultiplebuff...@8 + wglUseFontBitmapsA = wglusefontbitma...@16 + wglUseFontBitmapsW = wglusefontbitma...@16 + wglUseFontOutlinesA = wglusefontoutlin...@32 + wglUseFontOutlinesW = wglusefontoutlin...@32 + DrvCopyContext = drvcopycont...@12 + DrvCreateContext = drvcreatecont...@4 + DrvCreateLayerContext = drvcreatelayercont...@8 + DrvDeleteContext = drvdeletecont...@4 + DrvDescribeLayerPlane = drvdescribelayerpl...@20 + DrvDescribePixelFormat = drvdescribepixelfor...@16 + DrvGetLayerPaletteEntries = drvgetlayerpaletteentr...@20 + DrvGetProcAddress = drvgetprocaddr...@4 + DrvRealizeLayerPalette = drvrealizelayerpale...@12 + DrvReleaseContext = drvreleasecont...@4 + DrvSetCallbackProcs = drvsetcallbackpr...@8 + DrvSetContext = drvsetcont...@12 + DrvSetLayerPaletteEntries = drvsetlayerpaletteentr...@20 + DrvSetPixelFormat = drvsetpixelfor...@8 + DrvShareLists = drvshareli...@8 + DrvSwapBuffers = drvswapbuff...@4 + DrvSwapLayerBuffers = drvswaplayerbuff...@8 + DrvValidateVersion = drvvalidatevers...@4 diff --git a/src/gallium/winsys/gdi/SConscript b/src/gallium/winsys/gdi/SConscript index f9c1a34..72b5df8 100644 --- a/src/gallium/winsys/gdi/SConscript +++ b/src/gallium/winsys/gdi/SConscript @@ -11,12 +11,6 @@ if env['platform'] == 'windows': '#src/gallium/state_trackers/wgl', ]) - env.Append(CPPDEFINES = [ - '__GL_EXPORTS', - 'BUILD_GL32', - '_GNU_H_WINDOWS32_DEFINES', - ]) - env.Append(LIBS = [ 'gdi32', 'user32', @@ -24,9 +18,13 @@ if env['platform'] == 'windows': ]) sources = [ - '#src/gallium/state_trackers/wgl/opengl32.def', 'gdi_softpipe_winsys.c', ] + + if env['toolchain'] == 'crossmingw': + sources += ['#src/gallium/state_trackers/wgl/opengl32.mingw.def'] + else: + sources += ['#src/gallium/state_trackers/wgl/opengl32.def'] drivers = [ softpipe, _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
