Skip to content

W
wine-cw
Commit 3e2ed5e4 authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Alexandre Julliard
Browse files
Options

Remove glut32.

parent 526e1353
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 150 deletions
Makefile.in
View file @ 3e2ed5e4
...@@ -226,7 +226,6 @@ ALL_MAKEFILES = \ ...@@ -226,7 +226,6 @@ ALL_MAKEFILES = \
dlls/gdi32/Makefile \ dlls/gdi32/Makefile \
dlls/gdi32/tests/Makefile \ dlls/gdi32/tests/Makefile \
dlls/glu32/Makefile \ dlls/glu32/Makefile \
dlls/glut32/Makefile \
dlls/gphoto2.ds/Makefile \ dlls/gphoto2.ds/Makefile \
dlls/hhctrl.ocx/Makefile \ dlls/hhctrl.ocx/Makefile \
dlls/hid/Makefile \ dlls/hid/Makefile \
...@@ -550,7 +549,6 @@ dlls/dxguid/Makefile: dlls/dxguid/Makefile.in dlls/Makeimplib.rules ...@@ -550,7 +549,6 @@ dlls/dxguid/Makefile: dlls/dxguid/Makefile.in dlls/Makeimplib.rules
dlls/gdi32/Makefile: dlls/gdi32/Makefile.in dlls/Makedll.rules dlls/gdi32/Makefile: dlls/gdi32/Makefile.in dlls/Makedll.rules
dlls/gdi32/tests/Makefile: dlls/gdi32/tests/Makefile.in dlls/Maketest.rules dlls/gdi32/tests/Makefile: dlls/gdi32/tests/Makefile.in dlls/Maketest.rules
dlls/glu32/Makefile: dlls/glu32/Makefile.in dlls/Makedll.rules dlls/glu32/Makefile: dlls/glu32/Makefile.in dlls/Makedll.rules
dlls/glut32/Makefile: dlls/glut32/Makefile.in dlls/Makedll.rules
dlls/gphoto2.ds/Makefile: dlls/gphoto2.ds/Makefile.in dlls/Makedll.rules dlls/gphoto2.ds/Makefile: dlls/gphoto2.ds/Makefile.in dlls/Makedll.rules
dlls/hhctrl.ocx/Makefile: dlls/hhctrl.ocx/Makefile.in dlls/Makedll.rules dlls/hhctrl.ocx/Makefile: dlls/hhctrl.ocx/Makefile.in dlls/Makedll.rules
dlls/hid/Makefile: dlls/hid/Makefile.in dlls/Makedll.rules dlls/hid/Makefile: dlls/hid/Makefile.in dlls/Makedll.rules
......
configure.ac
View file @ 3e2ed5e4
...@@ -440,12 +440,6 @@ then ...@@ -440,12 +440,6 @@ then
$OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS
) )
fi fi
dnl Check for glut32 library.
AC_CHECK_LIB(glut,glutMainLoop,
[AC_SUBST(GLUT_LIBS,"-lglut -lXmu -lXi")
AC_SUBST(GLUT32FILES,'$(GLUT32FILES)')],,
$OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXmu -lXi -lX11 $X_EXTRA_LIBS)
else else
wine_cv_opengl_headers_found="no" wine_cv_opengl_headers_found="no"
fi fi
...@@ -1596,7 +1590,6 @@ dlls/dxguid/Makefile ...@@ -1596,7 +1590,6 @@ dlls/dxguid/Makefile
dlls/gdi32/Makefile dlls/gdi32/Makefile
dlls/gdi32/tests/Makefile dlls/gdi32/tests/Makefile
dlls/glu32/Makefile dlls/glu32/Makefile
dlls/glut32/Makefile
dlls/gphoto2.ds/Makefile dlls/gphoto2.ds/Makefile
dlls/hhctrl.ocx/Makefile dlls/hhctrl.ocx/Makefile
dlls/hid/Makefile dlls/hid/Makefile
......
dlls/.gitignore
View file @ 3e2ed5e4
...@@ -91,7 +91,6 @@ dpnet/libdpnet.def ...@@ -91,7 +91,6 @@ dpnet/libdpnet.def
dsound/libdsound.def dsound/libdsound.def
gdi32/libgdi32.def gdi32/libgdi32.def
glu32/libglu32.def glu32/libglu32.def
glut32/libglut32.def
hid/libhid.def hid/libhid.def
hlink/libhlink.def hlink/libhlink.def
icmp/libicmp.def icmp/libicmp.def
......
dlls/Makefile.in
View file @ 3e2ed5e4
...@@ -8,11 +8,10 @@ VPATH = @srcdir@ ...@@ -8,11 +8,10 @@ VPATH = @srcdir@
# special configure-dependent targets # special configure-dependent targets
GLU32FILES = glu32 GLU32FILES = glu32
GLUT32FILES = glut32
OPENGLFILES = opengl32 wined3d OPENGLFILES = opengl32 wined3d
QUARTZFILES = winequartz.drv QUARTZFILES = winequartz.drv
XFILES = winex11.drv XFILES = winex11.drv
EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @QUARTZFILES@ @XFILES@ EXTRADIRS = @GLU32FILES@ @OPENGLFILES@ @QUARTZFILES@ @XFILES@
# Subdir list # Subdir list
...@@ -276,7 +275,6 @@ SUBDIRS = \ ...@@ -276,7 +275,6 @@ SUBDIRS = \
$(IMPLIBSUBDIRS) \ $(IMPLIBSUBDIRS) \
$(TESTSUBDIRS) \ $(TESTSUBDIRS) \
glu32 \ glu32 \
glut32 \
opengl32 \ opengl32 \
wined3d \ wined3d \
winequartz.drv \ winequartz.drv \
...@@ -528,7 +526,6 @@ IMPORT_LIBS = \ ...@@ -528,7 +526,6 @@ IMPORT_LIBS = \
dsound/libdsound.$(IMPLIBEXT) \ dsound/libdsound.$(IMPLIBEXT) \
gdi32/libgdi32.$(IMPLIBEXT) \ gdi32/libgdi32.$(IMPLIBEXT) \
glu32/libglu32.$(IMPLIBEXT) \ glu32/libglu32.$(IMPLIBEXT) \
glut32/libglut32.$(IMPLIBEXT) \
hid/libhid.$(IMPLIBEXT) \ hid/libhid.$(IMPLIBEXT) \
hlink/libhlink.$(IMPLIBEXT) \ hlink/libhlink.$(IMPLIBEXT) \
icmp/libicmp.$(IMPLIBEXT) \ icmp/libicmp.$(IMPLIBEXT) \
...@@ -727,9 +724,6 @@ gdi32/libgdi32.$(IMPLIBEXT): gdi32/gdi32.spec $(WINEBUILD) ...@@ -727,9 +724,6 @@ gdi32/libgdi32.$(IMPLIBEXT): gdi32/gdi32.spec $(WINEBUILD)
glu32/libglu32.$(IMPLIBEXT): glu32/glu32.spec $(WINEBUILD) glu32/libglu32.$(IMPLIBEXT): glu32/glu32.spec $(WINEBUILD)
@cd glu32 && $(MAKE) libglu32.$(IMPLIBEXT) @cd glu32 && $(MAKE) libglu32.$(IMPLIBEXT)
glut32/libglut32.$(IMPLIBEXT): glut32/glut32.spec $(WINEBUILD)
@cd glut32 && $(MAKE) libglut32.$(IMPLIBEXT)
hid/libhid.$(IMPLIBEXT): hid/hid.spec $(WINEBUILD) hid/libhid.$(IMPLIBEXT): hid/hid.spec $(WINEBUILD)
@cd hid && $(MAKE) libhid.$(IMPLIBEXT) @cd hid && $(MAKE) libhid.$(IMPLIBEXT)
......
dlls/glut32/Makefile.in deleted 100644 → 0
View file @ 526e1353
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = glut32.dll
IMPORTLIB = libglut32.$(IMPLIBEXT)
IMPORTS = kernel32
EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ @GLUT_LIBS@
C_SRCS = \
glut.c
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend
dlls/glut32/glut32.spec deleted 100644 → 0
View file @ 526e1353
@ stdcall __glutCreateMenuWithExit(ptr ptr) wine___glutCreateMenuWithExit
@ stdcall __glutCreateWindowWithExit(ptr ptr) wine___glutCreateWindowWithExit
@ stdcall __glutInitWithExit(ptr ptr ptr) wine___glutInitWithExit
@ 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 glutCreateSubWindow(long long long long long) wine_glutCreateSubWindow
@ stdcall glutCreateWindow(ptr) wine_glutCreateWindow
@ 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 glutGet(long) wine_glutGet
@ stdcall glutGetColor(long long) wine_glutGetColor
@ 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 glutInit(ptr ptr) wine_glutInit
@ stdcall glutInitDisplayMode(long) wine_glutInitDisplayMode
@ stdcall glutInitDisplayString(ptr) wine_glutInitDisplayString
@ stdcall glutInitWindowPosition(long long) wine_glutInitWindowPosition
@ stdcall glutInitWindowSize(long long) wine_glutInitWindowSize
@ 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 glutSetWindow(long) wine_glutSetWindow
@ stdcall glutSetWindowTitle(ptr) wine_glutSetWindowTitle
@ stdcall glutSetupVideoResizing() wine_glutSetupVideoResizing
@ 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 glutVideoResize(long long long long) wine_glutVideoResize
@ stdcall glutVideoResizeGet(long) wine_glutVideoResizeGet
@ 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
View file @ 3e2ed5e4
...@@ -32,7 +32,6 @@ my %altnames = (); ...@@ -32,7 +32,6 @@ my %altnames = ();
my %special_dlls = my %special_dlls =
( (
"glu32" => "GLU32FILES", "glu32" => "GLU32FILES",
"glut32" => "GLUT32FILES",
"opengl32" => "OPENGLFILES", "opengl32" => "OPENGLFILES",
"wined3d" => "OPENGLFILES", "wined3d" => "OPENGLFILES",
"winex11.drv" => "XFILES", "winex11.drv" => "XFILES",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment