Author: jgardou Date: Thu Aug 23 19:45:25 2012 New Revision: 57145
URL: http://svn.reactos.org/svn/reactos?rev=57145&view=rev Log: [GLU32] - Use up-to-date mesa3d version
Added: trunk/reactos/dll/opengl/mesa/src/glu/sgi/CMakeLists.txt (with props) trunk/reactos/dll/opengl/mesa/src/glu/sgi/glu32.spec (with props) Removed: trunk/reactos/dll/win32/glu32/ Modified: trunk/reactos/dll/opengl/mesa/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/gallium/auxiliary/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CMakeLists.txt trunk/reactos/dll/win32/CMakeLists.txt
Modified: trunk/reactos/dll/opengl/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/CMakeLists.... ============================================================================== --- trunk/reactos/dll/opengl/mesa/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -23,7 +23,6 @@ -DWIN32 -D_WINDOWS -DPIPE_SUBSYSTEM_WINDOWS_USER - -DWIN32_LEAN_AND_MEAN -D_DLL # -DDEBUG )
Modified: trunk/reactos/dll/opengl/mesa/src/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/CMakeLi... ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -1,5 +1,6 @@
add_subdirectory(gallium) add_subdirectory(glsl) +add_subdirectory(glu/sgi) add_subdirectory(mapi/glapi) add_subdirectory(mesa)
Modified: trunk/reactos/dll/opengl/mesa/src/gallium/auxiliary/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/gallium... ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/auxiliary/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/auxiliary/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -2,6 +2,8 @@ include_directories( indices util) + +add_definitions(-DWIN32_LEAN_AND_MEAN)
list(APPEND SOURCE #generated files
Modified: trunk/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/gallium... ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -3,6 +3,7 @@ -D_GDI32_ # prevent gl* being declared __declspec(dllimport) in MS headers -DBUILD_GL32 # declare gl* as __declspec(dllexport) in Mesa headers -D_GLAPI_NO_EXPORTS # prevent _glapi_* from being declared __declspec(dllimport) + -DWIN32_LEAN_AND_MEAN ) if(NOT MSVC) add_compile_flags("-Wno-implicit-function-declaration")
Modified: trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/gallium... ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -6,6 +6,8 @@ ../../state_trackers/wgl ../../winsys/sw ) + +add_definitions(-DWIN32_LEAN_AND_MEAN)
list(APPEND SOURCE libgl_gdi.c)
Modified: trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/gallium... ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -1,2 +1,4 @@ + +add_definitions(-DWIN32_LEAN_AND_MEAN)
add_library(gallium_ws_gdi STATIC EXCLUDE_FROM_ALL gdi_sw_winsys.c)
Added: trunk/reactos/dll/opengl/mesa/src/glu/sgi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glu/sgi... ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glu/sgi/CMakeLists.txt (added) +++ trunk/reactos/dll/opengl/mesa/src/glu/sgi/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -1,0 +1,125 @@ + +include_directories(#BEFORE + include + libnurbs/internals + libnurbs/interface + libnurbs/nurbtess +) + +add_definitions( + -DBUILD_GLU32 + -DNDEBUG + -DLIBRARYBUILD + -DRESOLVE_3D_TEXTURE_SUPPORT +) + +#this library uses C++ +set_cpp() + +# we must ue our own spec file +spec2def(glu32.dll glu32.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + libutil/error.c + libutil/glue.c + libutil/mipmap.c + libutil/project.c + libutil/quad.c + libutil/registry.c + libtess/dict.c + libtess/geom.c + libtess/memalloc.c + libtess/mesh.c + libtess/normal.c + libtess/priorityq.c + libtess/render.c + libtess/sweep.c + libtess/tess.c + libtess/tessmono.c + libnurbs/interface/bezierEval.cc + libnurbs/interface/bezierPatch.cc + libnurbs/interface/bezierPatchMesh.cc + libnurbs/interface/glcurveval.cc + libnurbs/interface/glinterface.cc + libnurbs/interface/glrenderer.cc + libnurbs/interface/glsurfeval.cc + libnurbs/interface/incurveeval.cc + libnurbs/interface/insurfeval.cc + libnurbs/internals/arc.cc + libnurbs/internals/arcsorter.cc + libnurbs/internals/arctess.cc + libnurbs/internals/backend.cc + libnurbs/internals/basiccrveval.cc + libnurbs/internals/basicsurfeval.cc + libnurbs/internals/bin.cc + libnurbs/internals/bufpool.cc + libnurbs/internals/cachingeval.cc + libnurbs/internals/ccw.cc + libnurbs/internals/coveandtiler.cc + libnurbs/internals/curve.cc + libnurbs/internals/curvelist.cc + libnurbs/internals/curvesub.cc + libnurbs/internals/dataTransform.cc + libnurbs/internals/displaylist.cc + libnurbs/internals/flist.cc + libnurbs/internals/flistsorter.cc + libnurbs/internals/hull.cc + libnurbs/internals/intersect.cc + libnurbs/internals/knotvector.cc + libnurbs/internals/mapdesc.cc + libnurbs/internals/mapdescv.cc + libnurbs/internals/maplist.cc + libnurbs/internals/mesher.cc + libnurbs/internals/monoTriangulationBackend.cc + libnurbs/internals/monotonizer.cc + libnurbs/internals/mycode.cc + libnurbs/internals/nurbsinterfac.cc + libnurbs/internals/nurbstess.cc + libnurbs/internals/patch.cc + libnurbs/internals/patchlist.cc + libnurbs/internals/quilt.cc + libnurbs/internals/reader.cc + libnurbs/internals/renderhints.cc + libnurbs/internals/slicer.cc + libnurbs/internals/sorter.cc + libnurbs/internals/splitarcs.cc + libnurbs/internals/subdivider.cc + libnurbs/internals/tobezier.cc + libnurbs/internals/trimline.cc + libnurbs/internals/trimregion.cc + libnurbs/internals/trimvertpool.cc + libnurbs/internals/uarray.cc + libnurbs/internals/varray.cc + libnurbs/nurbtess/directedLine.cc + libnurbs/nurbtess/gridWrap.cc + libnurbs/nurbtess/monoChain.cc + libnurbs/nurbtess/monoPolyPart.cc + libnurbs/nurbtess/monoTriangulation.cc + libnurbs/nurbtess/partitionX.cc + libnurbs/nurbtess/partitionY.cc + libnurbs/nurbtess/polyDBG.cc + libnurbs/nurbtess/polyUtil.cc + libnurbs/nurbtess/primitiveStream.cc + libnurbs/nurbtess/quicksort.cc + libnurbs/nurbtess/rectBlock.cc + libnurbs/nurbtess/sampleComp.cc + libnurbs/nurbtess/sampleCompBot.cc + libnurbs/nurbtess/sampleCompRight.cc + libnurbs/nurbtess/sampleCompTop.cc + libnurbs/nurbtess/sampleMonoPoly.cc + libnurbs/nurbtess/sampledLine.cc + libnurbs/nurbtess/searchTree.cc + ${CMAKE_CURRENT_BINARY_DIR}/glu32.def +) + +add_library(glu32 SHARED ${SOURCE}) +set_module_type(glu32 win32dll ENTRYPOINT 0) + +add_importlibs(glu32 + opengl32 + gdi32 + msvcrt + kernel32 + ntdll) + +add_cd_file(TARGET glu32 DESTINATION reactos/system32 FOR all)
Propchange: trunk/reactos/dll/opengl/mesa/src/glu/sgi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/dll/opengl/mesa/src/glu/sgi/glu32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glu/sgi... ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glu/sgi/glu32.spec (added) +++ trunk/reactos/dll/opengl/mesa/src/glu/sgi/glu32.spec [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -1,0 +1,59 @@ +@ stdcall gluBeginCurve(ptr) +@ stdcall gluBeginPolygon(ptr) +@ stdcall gluBeginSurface(ptr) +@ stdcall gluBeginTrim(ptr) +@ stdcall gluBuild1DMipmapLevels(long long long long long long long long ptr) +@ stdcall gluBuild1DMipmaps(long long long long long ptr) +@ stdcall gluBuild2DMipmapLevels(long long long long long long long long long ptr) +@ stdcall gluBuild2DMipmaps(long long long long long long ptr) +@ stdcall gluBuild3DMipmapLevels(long long long long long long long long long long ptr) +@ stdcall gluBuild3DMipmaps(long long long long long long long ptr) +@ stdcall gluCheckExtension(str ptr) +@ stdcall gluCylinder(ptr double double double long long) +@ stdcall gluDeleteNurbsRenderer(ptr) +@ stdcall gluDeleteQuadric(ptr) +@ stdcall gluDeleteTess(ptr) +@ stdcall gluDisk(ptr double double long long) +@ stdcall gluEndCurve(ptr) +@ stdcall gluEndPolygon(ptr) +@ stdcall gluEndSurface(ptr) +@ stdcall gluEndTrim(ptr) +@ stdcall gluErrorString(long) +@ stdcall gluGetNurbsProperty(ptr long ptr) +@ stdcall gluGetString(long) +@ stdcall gluGetTessProperty(ptr long ptr) +@ stdcall gluLoadSamplingMatrices(ptr ptr ptr ptr) +@ stdcall gluLookAt(double double double double double double double double double) +@ stdcall gluNewNurbsRenderer() +@ stdcall gluNewQuadric() +@ stdcall gluNewTess() +@ stdcall gluNextContour(ptr long) +@ stdcall gluNurbsCallback(ptr long ptr) +@ stdcall gluNurbsCallbackData(ptr ptr) +@ stdcall gluNurbsCallbackDataEXT(ptr ptr) +@ stdcall gluNurbsCurve(ptr long ptr long ptr long long) +@ stdcall gluNurbsProperty(ptr long long) +@ stdcall gluNurbsSurface(ptr long ptr long ptr long long ptr long long long) +@ stdcall gluOrtho2D(double double double double) +@ stdcall gluPartialDisk(ptr double double long long double double) +@ stdcall gluPerspective(double double double double) +@ stdcall gluPickMatrix(double double double double ptr) +@ stdcall gluProject(double double double ptr ptr ptr ptr ptr ptr) +@ stdcall gluPwlCurve(ptr long ptr long long) +@ stdcall gluQuadricCallback(ptr long ptr) +@ stdcall gluQuadricDrawStyle(ptr long) +@ stdcall gluQuadricNormals(ptr long) +@ stdcall gluQuadricOrientation(ptr long) +@ stdcall gluQuadricTexture(ptr long) +@ stdcall gluScaleImage(long long long long ptr long long long ptr) +@ stdcall gluSphere(ptr double long long) +@ stdcall gluTessBeginContour(ptr) +@ stdcall gluTessBeginPolygon(ptr ptr) +@ stdcall gluTessCallback(ptr long ptr) +@ stdcall gluTessEndContour(ptr) +@ stdcall gluTessEndPolygon(ptr) +@ stdcall gluTessNormal(ptr double double double) +@ stdcall gluTessProperty(ptr long double) +@ stdcall gluTessVertex(ptr ptr ptr) +@ stdcall gluUnProject(double double double ptr ptr ptr ptr ptr ptr) +@ stdcall gluUnProject4(double double double double ptr ptr ptr double double ptr ptr ptr ptr)
Propchange: trunk/reactos/dll/opengl/mesa/src/glu/sgi/glu32.spec ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?re... ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Thu Aug 23 19:45:25 2012 @@ -41,7 +41,6 @@ add_subdirectory(fusion) add_subdirectory(gdiplus) add_subdirectory(getuname) -add_subdirectory(glu32) add_subdirectory(hhctrl.ocx) add_subdirectory(hid) add_subdirectory(hlink)
-
jgardou＠svn.reactos.org