Skip to content

Commit

Permalink
Remove glut32.
Browse files Browse the repository at this point in the history
  • Loading branch information
Roderick Colenbrander authored and julliard committed Dec 4, 2006
1 parent 526e135 commit 3e2ed5e
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 1,330 deletions.
2 changes: 0 additions & 2 deletions Makefile.in
Expand Up @@ -226,7 +226,6 @@ ALL_MAKEFILES = \
dlls/gdi32/Makefile \
dlls/gdi32/tests/Makefile \
dlls/glu32/Makefile \
dlls/glut32/Makefile \
dlls/gphoto2.ds/Makefile \
dlls/hhctrl.ocx/Makefile \
dlls/hid/Makefile \
Expand Down Expand Up @@ -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/tests/Makefile: dlls/gdi32/tests/Makefile.in dlls/Maketest.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/hhctrl.ocx/Makefile: dlls/hhctrl.ocx/Makefile.in dlls/Makedll.rules
dlls/hid/Makefile: dlls/hid/Makefile.in dlls/Makedll.rules
Expand Down
94 changes: 2 additions & 92 deletions configure

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions configure.ac
Expand Up @@ -440,12 +440,6 @@ then
$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 -lXmu -lXi")
AC_SUBST(GLUT32FILES,'$(GLUT32FILES)')],,
$OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXmu -lXi -lX11 $X_EXTRA_LIBS)
else
wine_cv_opengl_headers_found="no"
fi
Expand Down Expand Up @@ -1596,7 +1590,6 @@ dlls/dxguid/Makefile
dlls/gdi32/Makefile
dlls/gdi32/tests/Makefile
dlls/glu32/Makefile
dlls/glut32/Makefile
dlls/gphoto2.ds/Makefile
dlls/hhctrl.ocx/Makefile
dlls/hid/Makefile
Expand Down
1 change: 0 additions & 1 deletion dlls/.gitignore
Expand Up @@ -91,7 +91,6 @@ dpnet/libdpnet.def
dsound/libdsound.def
gdi32/libgdi32.def
glu32/libglu32.def
glut32/libglut32.def
hid/libhid.def
hlink/libhlink.def
icmp/libicmp.def
Expand Down
8 changes: 1 addition & 7 deletions dlls/Makefile.in
Expand Up @@ -8,11 +8,10 @@ VPATH = @srcdir@
# special configure-dependent targets

GLU32FILES = glu32
GLUT32FILES = glut32
OPENGLFILES = opengl32 wined3d
QUARTZFILES = winequartz.drv
XFILES = winex11.drv
EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @QUARTZFILES@ @XFILES@
EXTRADIRS = @GLU32FILES@ @OPENGLFILES@ @QUARTZFILES@ @XFILES@

# Subdir list

Expand Down Expand Up @@ -276,7 +275,6 @@ SUBDIRS = \
$(IMPLIBSUBDIRS) \
$(TESTSUBDIRS) \
glu32 \
glut32 \
opengl32 \
wined3d \
winequartz.drv \
Expand Down Expand Up @@ -528,7 +526,6 @@ IMPORT_LIBS = \
dsound/libdsound.$(IMPLIBEXT) \
gdi32/libgdi32.$(IMPLIBEXT) \
glu32/libglu32.$(IMPLIBEXT) \
glut32/libglut32.$(IMPLIBEXT) \
hid/libhid.$(IMPLIBEXT) \
hlink/libhlink.$(IMPLIBEXT) \
icmp/libicmp.$(IMPLIBEXT) \
Expand Down Expand Up @@ -727,9 +724,6 @@ gdi32/libgdi32.$(IMPLIBEXT): gdi32/gdi32.spec $(WINEBUILD)
glu32/libglu32.$(IMPLIBEXT): glu32/glu32.spec $(WINEBUILD)
@cd glu32 && $(MAKE) libglu32.$(IMPLIBEXT)

glut32/libglut32.$(IMPLIBEXT): glut32/glut32.spec $(WINEBUILD)
@cd glut32 && $(MAKE) libglut32.$(IMPLIBEXT)

hid/libhid.$(IMPLIBEXT): hid/hid.spec $(WINEBUILD)
@cd hid && $(MAKE) libhid.$(IMPLIBEXT)

Expand Down
15 changes: 0 additions & 15 deletions dlls/glut32/Makefile.in

This file was deleted.

0 comments on commit 3e2ed5e

Please sign in to comment.