Added glut32 dll.

configure.ac

@@ -340,6 +340,12 @@ This prevents linking to OpenGL. Delete the file and restart configure.])
 			     $OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS
 		)
 	     fi
+
+             dnl Check for glut32 library.
+             AC_CHECK_LIB(glut,glutMainLoop,
+                       [AC_SUBST(GLUT_LIBS,"-lglut")
+                        AC_SUBST(GLUT32FILES,'$(GLUT32FILES)')],,
+                        $OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
 	 fi
     fi
 
@@ -1516,6 +1522,7 @@ dlls/dsound/tests/Makefile
 dlls/gdi/Makefile
 dlls/gdi/tests/Makefile
 dlls/glu32/Makefile
+dlls/glut32/Makefile
 dlls/icmp/Makefile
 dlls/imagehlp/Makefile
 dlls/imm32/Makefile

dlls/Makefile.in

@@ -8,9 +8,10 @@ VPATH     = @srcdir@
 # special configure-dependent targets
 
 GLU32FILES = glu32
+GLUT32FILES = glut32
 OPENGLFILES = d3d8 d3d9 d3dx8 opengl32 wined3d
 XFILES = ddraw x11drv
-EXTRADIRS = @GLU32FILES@ @OPENGLFILES@ @XFILES@
+EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@
 
 # Subdir list
 
@@ -139,6 +140,7 @@ SUBDIRS = \
 	d3dx8 \
 	ddraw \
 	glu32 \
+	glut32 \
 	opengl32 \
 	wined3d \
 	x11drv
@@ -436,6 +438,9 @@ gdi32.dll$(DLLEXT) dispdib.dll$(DLLEXT) gdi.exe$(DLLEXT) \
 glu32.dll$(DLLEXT): glu32/glu32.dll$(DLLEXT)
 	$(RM) $@ && $(LN_S) glu32/glu32.dll$(DLLEXT) $@
 
+glut32.dll$(DLLEXT): glut32/glut32.dll$(DLLEXT)
+	$(RM) $@ && $(LN_S) glut32/glut32.dll$(DLLEXT) $@
+
 icmp.dll$(DLLEXT): icmp/icmp.dll$(DLLEXT)
 	$(RM) $@ && $(LN_S) icmp/icmp.dll$(DLLEXT) $@
 
@@ -745,6 +750,7 @@ IMPORT_LIBS = \
 	libdsound \
 	libgdi32 \
 	libglu32 \
+	libglut32 \
 	libicmp \
 	libimagehlp \
 	libimm32 \
@@ -995,6 +1001,11 @@ libglu32.def: glu32/glu32.spec.def
 libglu32.a: glu32/glu32.spec.def
 	$(DLLTOOL) -k -l $@ -d glu32/glu32.spec.def
 
+libglut32.def: glut32/glut32.spec.def
+	$(RM) $@ && $(LN_S) glut32/glut32.spec.def $@
+libglut32.a: glut32/glut32.spec.def
+	$(DLLTOOL) -k -l $@ -d glut32/glut32.spec.def
+
 libicmp.def: icmp/icmp.spec.def
 	$(RM) $@ && $(LN_S) icmp/icmp.spec.def $@
 libicmp.a: icmp/icmp.spec.def
@@ -1376,6 +1387,7 @@ dpnhpast/dpnhpast.spec.def: $(WINEBUILD)
 dsound/dsound.spec.def: $(WINEBUILD)
 gdi/gdi32.spec.def: $(WINEBUILD)
 glu32/glu32.spec.def: $(WINEBUILD)
+glut32/glut32.spec.def: $(WINEBUILD)
 icmp/icmp.spec.def: $(WINEBUILD)
 imagehlp/imagehlp.spec.def: $(WINEBUILD)
 imm32/imm32.spec.def: $(WINEBUILD)
@@ -1488,6 +1500,7 @@ dpnhpast/dpnhpast.dll$(DLLEXT): dpnhpast
 dsound/dsound.dll$(DLLEXT): dsound
 gdi/gdi32.dll$(DLLEXT): gdi
 glu32/glu32.dll$(DLLEXT): glu32
+glut32/glut32.dll$(DLLEXT): glut32
 icmp/icmp.dll$(DLLEXT): icmp
 msacm/imaadp32/imaadp32.acm$(DLLEXT): msacm/imaadp32
 imagehlp/imagehlp.dll$(DLLEXT): imagehlp

dlls/glut32/.cvsignore

+Makefile
+glut32.dll.dbg.c
+glut32.spec.c
+glut32.spec.def

dlls/glut32/Makefile.in

+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = glut32.dll
+IMPORTS   = kernel32
+EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ @GLUT_LIBS@
+
+C_SRCS = \
+	glut.c
+
+@MAKE_DLL_RULES@
+
+### Dependencies:

dlls/glut32/glut32.spec

+@ stdcall glutAddMenuEntry(ptr long) wine_glutAddMenuEntry
+@ stdcall glutAddSubMenu(ptr long) wine_glutAddSubMenu
+@ stdcall glutAttachMenu(long) wine_glutAttachMenu
+@ stdcall glutBitmapCharacter(ptr long) wine_glutBitmapCharacter
+@ stdcall glutBitmapLength(ptr ptr) wine_glutBitmapLength
+@ stdcall glutBitmapWidth(ptr long) wine_glutBitmapWidth
+@ stdcall glutButtonBoxFunc(ptr) wine_glutButtonBoxFunc
+@ stdcall glutChangeToMenuEntry(long ptr long) wine_glutChangeToMenuEntry
+@ stdcall glutChangeToSubMenu(long ptr long) wine_glutChangeToSubMenu
+@ stdcall glutCopyColormap(long) wine_glutCopyColormap
+@ stdcall glutCreateMenu(ptr) wine_glutCreateMenu
+@ stdcall __glutCreateMenuWithExit(ptr ptr) wine___glutCreateMenuWithExit
+@ stdcall glutCreateSubWindow(long long long long long) wine_glutCreateSubWindow
+@ stdcall glutCreateWindow(ptr) wine_glutCreateWindow
+@ stdcall __glutCreateWindowWithExit(ptr ptr) wine___glutCreateWindowWithExit
+@ stdcall glutDestroyMenu(long) wine_glutDestroyMenu
+@ stdcall glutDestroyWindow(long) wine_glutDestroyWindow
+@ stdcall glutDetachMenu(long) wine_glutDetachMenu
+@ stdcall glutDeviceGet(long) wine_glutDeviceGet
+@ stdcall glutDialsFunc(ptr) wine_glutDialsFunc
+@ stdcall glutDisplayFunc(ptr) wine_glutDisplayFunc
+@ stdcall glutEnterGameMode() wine_glutEnterGameMode
+@ stdcall glutEntryFunc(ptr) wine_glutEntryFunc
+@ stdcall glutEstablishOverlay() wine_glutEstablishOverlay
+@ stdcall glutExtensionSupported(ptr) wine_glutExtensionSupported
+@ stdcall glutForceJoystickFunc() wine_glutForceJoystickFunc
+@ stdcall glutFullScreen() wine_glutFullScreen
+@ stdcall glutGameModeGet(long) wine_glutGameModeGet
+@ stdcall glutGameModeString(ptr) wine_glutGameModeString
+@ stdcall glutGetColor(long long) wine_glutGetColor
+@ stdcall glutGet(long) wine_glutGet
+@ stdcall glutGetMenu() wine_glutGetMenu
+@ stdcall glutGetModifiers() wine_glutGetModifiers
+@ stdcall glutGetWindow() wine_glutGetWindow
+@ stdcall glutHideOverlay() wine_glutHideOverlay
+@ stdcall glutHideWindow() wine_glutHideWindow
+@ stdcall glutIconifyWindow() wine_glutIconifyWindow
+@ stdcall glutIdleFunc(ptr) wine_glutIdleFunc
+@ stdcall glutIgnoreKeyRepeat(long) wine_glutIgnoreKeyRepeat
+@ stdcall glutInitDisplayMode(long) wine_glutInitDisplayMode
+@ stdcall glutInitDisplayString(ptr) wine_glutInitDisplayString
+@ stdcall glutInit(ptr ptr) wine_glutInit
+@ stdcall glutInitWindowPosition(long long) wine_glutInitWindowPosition
+@ stdcall glutInitWindowSize(long long) wine_glutInitWindowSize
+@ stdcall __glutInitWithExit(ptr ptr ptr) wine___glutInitWithExit
+@ stdcall glutJoystickFunc(ptr long) wine_glutJoystickFunc
+@ stdcall glutKeyboardFunc(ptr) wine_glutKeyboardFunc
+@ stdcall glutKeyboardUpFunc(ptr) wine_glutKeyboardUpFunc
+@ stdcall glutLayerGet(long) wine_glutLayerGet
+@ stdcall glutLeaveGameMode() wine_glutLeaveGameMode
+@ stdcall glutMainLoop() wine_glutMainLoop
+@ stdcall glutMenuStateFunc(ptr) wine_glutMenuStateFunc
+@ stdcall glutMenuStatusFunc(ptr) wine_glutMenuStatusFunc
+@ stdcall glutMotionFunc(ptr) wine_glutMotionFunc
+@ stdcall glutMouseFunc(ptr) wine_glutMouseFunc
+@ stdcall glutOverlayDisplayFunc(ptr) wine_glutOverlayDisplayFunc
+@ stdcall glutPassiveMotionFunc(ptr) wine_glutPassiveMotionFunc
+@ stdcall glutPopWindow() wine_glutPopWindow
+@ stdcall glutPositionWindow(long long) wine_glutPositionWindow
+@ stdcall glutPostOverlayRedisplay() wine_glutPostOverlayRedisplay
+@ stdcall glutPostRedisplay() wine_glutPostRedisplay
+@ stdcall glutPostWindowOverlayRedisplay(long) wine_glutPostWindowOverlayRedisplay
+@ stdcall glutPostWindowRedisplay(long) wine_glutPostWindowRedisplay
+@ stdcall glutPushWindow() wine_glutPushWindow
+@ stdcall glutRemoveMenuItem(long) wine_glutRemoveMenuItem
+@ stdcall glutRemoveOverlay() wine_glutRemoveOverlay
+@ stdcall glutReportErrors() wine_glutReportErrors
+@ stdcall glutReshapeFunc(ptr) wine_glutReshapeFunc
+@ stdcall glutReshapeWindow(long long) wine_glutReshapeWindow
+@ stdcall glutSetColor(long long long) wine_glutSetColor
+@ stdcall glutSetCursor(long) wine_glutSetCursor
+@ stdcall glutSetIconTitle(ptr) wine_glutSetIconTitle
+@ stdcall glutSetKeyRepeat(long) wine_glutSetKeyRepeat
+@ stdcall glutSetMenu(long) wine_glutSetMenu
+@ stdcall glutSetupVideoResizing() wine_glutSetupVideoResizing
+@ stdcall glutSetWindow(long) wine_glutSetWindow
+@ stdcall glutSetWindowTitle(ptr) wine_glutSetWindowTitle
+@ stdcall glutShowOverlay() wine_glutShowOverlay
+@ stdcall glutShowWindow() wine_glutShowWindow
+@ stdcall glutSolidCone(double double long long) wine_glutSolidCone
+@ stdcall glutSolidCube(double) wine_glutSolidCube
+@ stdcall glutSolidDodecahedron() wine_glutSolidDodecahedron
+@ stdcall glutSolidIcosahedron() wine_glutSolidIcosahedron
+@ stdcall glutSolidOctahedron() wine_glutSolidOctahedron
+@ stdcall glutSolidSphere(double long long) wine_glutSolidSphere
+@ stdcall glutSolidTeapot(double) wine_glutSolidTeapot
+@ stdcall glutSolidTetrahedron() wine_glutSolidTetrahedron
+@ stdcall glutSolidTorus(double double long long) wine_glutSolidTorus
+@ stdcall glutSpaceballButtonFunc(ptr) wine_glutSpaceballButtonFunc
+@ stdcall glutSpaceballMotionFunc(ptr) wine_glutSpaceballMotionFunc
+@ stdcall glutSpaceballRotateFunc(ptr) wine_glutSpaceballRotateFunc
+@ stdcall glutSpecialFunc(ptr) wine_glutSpecialFunc
+@ stdcall glutSpecialUpFunc(ptr) wine_glutSpecialUpFunc
+@ stdcall glutStopVideoResizing() wine_glutStopVideoResizing
+@ stdcall glutStrokeCharacter(ptr long) wine_glutStrokeCharacter
+@ stdcall glutStrokeLength(ptr ptr) wine_glutStrokeLength
+@ stdcall glutStrokeWidth(ptr long) wine_glutStrokeWidth
+@ stdcall glutSwapBuffers() wine_glutSwapBuffers
+@ stdcall glutTabletButtonFunc(ptr) wine_glutTabletButtonFunc
+@ stdcall glutTabletMotionFunc(ptr) wine_glutTabletMotionFunc
+@ stdcall glutTimerFunc(long ptr long) wine_glutTimerFunc
+@ stdcall glutUseLayer(long) wine_glutUseLayer
+@ stdcall glutVideoPan(long long long long) wine_glutVideoPan
+@ stdcall glutVideoResizeGet(long) wine_glutVideoResizeGet
+@ stdcall glutVideoResize(long long long long) wine_glutVideoResize
+@ stdcall glutVisibilityFunc(ptr) wine_glutVisibilityFunc
+@ stdcall glutWarpPointer(long long) wine_glutWarpPointer
+@ stdcall glutWindowStatusFunc(ptr) wine_glutWindowStatusFunc
+@ stdcall glutWireCone(double double long long) wine_glutWireCone
+@ stdcall glutWireCube(double) wine_glutWireCube
+@ stdcall glutWireDodecahedron() wine_glutWireDodecahedron
+@ stdcall glutWireIcosahedron() wine_glutWireIcosahedron
+@ stdcall glutWireOctahedron() wine_glutWireOctahedron
+@ stdcall glutWireSphere(double long long) wine_glutWireSphere
+@ stdcall glutWireTeapot(double) wine_glutWireTeapot
+@ stdcall glutWireTetrahedron() wine_glutWireTetrahedron
+@ stdcall glutWireTorus(double double long long) wine_glutWireTorus

dlls/make_dlls

@@ -33,6 +33,7 @@ my %special_dlls =
 (
   "ddraw"    => "XFILES",
   "glu32"    => "GLU32FILES",
+  "glut32"   => "GLUT32FILES",
   "opengl32" => "OPENGLFILES",
   "d3d8"     => "OPENGLFILES",
   "d3d9"     => "OPENGLFILES",