From 3e2ed5e4e569db552d3a814c073c94e971499253 Mon Sep 17 00:00:00 2001 From: Roderick Colenbrander Date: Mon, 4 Dec 2006 14:39:04 +0100 Subject: [PATCH] Remove glut32. --- Makefile.in | 2 - configure | 94 +--- configure.ac | 7 - dlls/.gitignore | 1 - dlls/Makefile.in | 8 +- dlls/glut32/Makefile.in | 15 - dlls/glut32/glut.c | 1088 --------------------------------------- dlls/glut32/glut32.spec | 117 ----- dlls/make_dlls | 1 - 9 files changed, 3 insertions(+), 1330 deletions(-) delete mode 100644 dlls/glut32/Makefile.in delete mode 100644 dlls/glut32/glut.c delete mode 100644 dlls/glut32/glut32.spec diff --git a/Makefile.in b/Makefile.in index ca6b0aa4504..f052305e5ba 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 \ @@ -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 diff --git a/configure b/configure index 7f1e5888d22..0efbcab2c7a 100755 --- a/configure +++ b/configure @@ -698,8 +698,6 @@ OPENGLFILES GLU32FILES OPENGL_LIBS QUARTZFILES -GLUT_LIBS -GLUT32FILES NASLIBS XML2LIBS XML2INCL @@ -9609,91 +9607,6 @@ if test $ac_cv_lib_GLU_gluLookAt = yes; then fi fi - - { echo "$as_me:$LINENO: checking for glutMainLoop in -lglut" >&5 -echo $ECHO_N "checking for glutMainLoop in -lglut... $ECHO_C" >&6; } -if test "${ac_cv_lib_glut_glutMainLoop+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglut $OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXmu -lXi -lX11 $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char glutMainLoop (); -int -main () -{ -return glutMainLoop (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_glut_glutMainLoop=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_glut_glutMainLoop=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_glut_glutMainLoop" >&5 -echo "${ECHO_T}$ac_cv_lib_glut_glutMainLoop" >&6; } -if test $ac_cv_lib_glut_glutMainLoop = yes; then - GLUT_LIBS="-lglut -lXmu -lXi" - - GLUT32FILES='$(GLUT32FILES)' - -fi - else wine_cv_opengl_headers_found="no" fi @@ -23806,7 +23719,7 @@ MAKE_TEST_RULES=dlls/Maketest.rules MAKE_PROG_RULES=programs/Makeprog.rules -ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/clusapi/Makefile dlls/comcat/Makefile dlls/comcat/tests/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/comdlg32/tests/Makefile dlls/compstui/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/cryptnet/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile 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 dlls/hlink/Makefile dlls/hlink/tests/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/infosoft/Makefile dlls/infosoft/tests/Makefile dlls/inseng/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel32/Makefile dlls/kernel32/tests/Makefile dlls/localspl/Makefile dlls/localspl/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/mscoree/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/nddeapi/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/pstorec/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/query/Makefile dlls/rasapi32/Makefile dlls/resutils/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/shdoclc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/svrapi/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user32/Makefile dlls/user32/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile dlls/wineps.drv/Makefile dlls/winequartz.drv/Makefile dlls/winex11.drv/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/tests/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winecoreaudio/Makefile dlls/winmm/wineesd/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wintrust/tests/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmd/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/oleview/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" +ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/clusapi/Makefile dlls/comcat/Makefile dlls/comcat/tests/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/comdlg32/tests/Makefile dlls/compstui/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/cryptnet/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi32/Makefile dlls/gdi32/tests/Makefile dlls/glu32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/hid/Makefile dlls/hlink/Makefile dlls/hlink/tests/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/infosoft/Makefile dlls/infosoft/tests/Makefile dlls/inseng/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel32/Makefile dlls/kernel32/tests/Makefile dlls/localspl/Makefile dlls/localspl/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/mscoree/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/nddeapi/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/pstorec/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/query/Makefile dlls/rasapi32/Makefile dlls/resutils/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/shdoclc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/svrapi/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user32/Makefile dlls/user32/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile dlls/wineps.drv/Makefile dlls/winequartz.drv/Makefile dlls/winex11.drv/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/tests/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winecoreaudio/Makefile dlls/winmm/wineesd/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wintrust/tests/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmd/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/oleview/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" cat >confcache <<\_ACEOF @@ -24437,7 +24350,6 @@ do "dlls/gdi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/Makefile" ;; "dlls/gdi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/tests/Makefile" ;; "dlls/glu32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/glu32/Makefile" ;; - "dlls/glut32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/glut32/Makefile" ;; "dlls/gphoto2.ds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gphoto2.ds/Makefile" ;; "dlls/hhctrl.ocx/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hhctrl.ocx/Makefile" ;; "dlls/hid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hid/Makefile" ;; @@ -24902,8 +24814,6 @@ OPENGLFILES!$OPENGLFILES$ac_delim GLU32FILES!$GLU32FILES$ac_delim OPENGL_LIBS!$OPENGL_LIBS$ac_delim QUARTZFILES!$QUARTZFILES$ac_delim -GLUT_LIBS!$GLUT_LIBS$ac_delim -GLUT32FILES!$GLUT32FILES$ac_delim NASLIBS!$NASLIBS$ac_delim XML2LIBS!$XML2LIBS$ac_delim XML2INCL!$XML2INCL$ac_delim @@ -24967,7 +24877,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 097c72d3099..04f75fcc147 100644 --- a/configure.ac +++ b/configure.ac @@ -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 @@ -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 diff --git a/dlls/.gitignore b/dlls/.gitignore index 7ac473bf051..df82e9d41f4 100644 --- a/dlls/.gitignore +++ b/dlls/.gitignore @@ -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 diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 69e95d92e60..334d2f96217 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -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 @@ -276,7 +275,6 @@ SUBDIRS = \ $(IMPLIBSUBDIRS) \ $(TESTSUBDIRS) \ glu32 \ - glut32 \ opengl32 \ wined3d \ winequartz.drv \ @@ -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) \ @@ -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) diff --git a/dlls/glut32/Makefile.in b/dlls/glut32/Makefile.in deleted file mode 100644 index b9f884a750b..00000000000 --- a/dlls/glut32/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -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 diff --git a/dlls/glut32/glut.c b/dlls/glut32/glut.c deleted file mode 100644 index 93a94ea6155..00000000000 --- a/dlls/glut32/glut.c +++ /dev/null @@ -1,1088 +0,0 @@ -/* - * Copyright 2003 Jacek Caban - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include -#include "windef.h" -#include "winbase.h" - -static void (*__glutExitFunc)(int ret) = 0; - -/*************************************************** - * DllMain [glut32.init] - */ -BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) -{ - if(fdwReason == DLL_PROCESS_DETACH) { - if(__glutExitFunc) - __glutExitFunc(0); - } - return TRUE; -} - -/**************************************************** - * glutGetColor (glut32.@) - */ -extern float glutGetColor(int arg1, int arg2); -float WINAPI wine_glutGetColor(int arg1, int arg2) -{ - return glutGetColor(arg1, arg2); -} - -/**************************************************** - * glutBitmapLength (glut32.@) - */ -extern int glutBitmapLength(void *arg1, void *arg2); -int WINAPI wine_glutBitmapLength(void *arg1, void *arg2) -{ - return glutBitmapLength(arg1, arg2); -} - -/**************************************************** - * glutBitmapWith (glut32.@) - */ -extern int glutBitmapWidth(void *arg1, int arg2); -int WINAPI wine_glutBitmapWidth(void *arg1, int arg2) -{ - return glutBitmapWidth(arg1, arg2); -} - -/**************************************************** - * glutCreateMenu (glut32.@) - */ -extern int glutCreateMenu(void *arg); -int WINAPI wine_glutCreateMenu(void *arg) -{ - return glutCreateMenu(arg); -} - -/**************************************************** - * __glutCreateMenuWithExit (glut32.@) - */ -int WINAPI wine___glutCreateMenuWithExit(void *arg1, void (*exitfunc)(int)) -{ - __glutExitFunc = exitfunc; - return glutCreateMenu(arg1); -} - -/***************************************************** - * glutCreateSubWindow (glut32.@) - */ -extern int glutCreateSubWindow(int arg1, int arg2, int arg3, int arg4, int arg5); -int WINAPI wine_glutCreateSubWindow(int arg1, int arg2, int arg3, int arg4, int arg5) -{ - return glutCreateSubWindow(arg1, arg2, arg3, arg4, arg5); -} - -/***************************************************** - * glutCreateWindow (glut32.@) - */ -extern int glutCreateWindow(void *arg); -int WINAPI wine_glutCreateWindow(void *arg) -{ - return glutCreateWindow(arg); -} - -/**************************************************** - * __glutCreateWindowWithExit (glut32.@) - */ -int WINAPI wine___glutCreateWindowWithExit(void *arg, void (*exitfunc)(int)) -{ - __glutExitFunc = exitfunc; - return glutCreateWindow(arg); -} - -/***************************************************** - * glutDeviceGet (glut32.@) - */ -extern int glutDeviceGet(int arg); -int WINAPI wine_glutDeviceGet(int arg) -{ - return glutDeviceGet(arg); -} - -/**************************************************** - * glutEnterGameMode (glut32.@) - */ -extern int glutEnterGameMode(void); -int WINAPI wine_glutEnterGameMode(void) -{ - return glutEnterGameMode(); -} - -/**************************************************** - * glutExtensionSupported (glut32.@) - */ -extern int glutExtensionSupported(void *arg); -int WINAPI wine_glutExtensionSupported(void *arg) -{ - return glutExtensionSupported(arg); -} - -/**************************************************** - * glutGameModeGet (glut32.@) - */ -extern int glutGameModeGet(int arg); -int WINAPI wine_glutGameModeGet(int arg) -{ - return glutGameModeGet(arg); -} - -/**************************************************** - * glutGetMenu (glut32.@) - */ -extern int glutGetMenu(void); -int WINAPI wine_glutGetMenu(void) -{ - return wine_glutGetMenu(); -} - -/**************************************************** - * glutGetModifiers (glut32.@) - */ -extern int glutGetModifiers(void); -int WINAPI wine_glutGetModifiers(void) -{ - return glutGetModifiers(); -} - -/**************************************************** - * glutGet (glut32.@) - */ -extern int glutGet(int arg); -int WINAPI wine_glutGet(int arg) -{ - return glutGet(arg); -} - -/**************************************************** - * glutGetWindow (glut32.@) - */ -extern int glutGetWindow(void); -int WINAPI wine_glutGetWindow(void) -{ - return glutGetWindow(); -} - -/**************************************************** - * glutLayerGet (glut32.@) - */ -extern int glutLayerGet(int arg); -int WINAPI wine_glutLayerGet(int arg) -{ - return glutLayerGet(arg); -} - -/**************************************************** - * glutStrokeLength (glut32.@) - */ -extern int glutStrokeLength(void *arg1, void* arg2); -int WINAPI wine_glutStrokeLength(void *arg1, void *arg2) -{ - return glutStrokeLength(arg1, arg2); -} - -/**************************************************** - * glutStrokeWidth (glut32.@) - */ -extern int glutStrokeWidth(void *arg1, int arg2); -int WINAPI wine_glutStrokeWidth(void *arg1, int arg2) -{ - return glutStrokeWidth(arg1, arg2); -} - -/**************************************************** - * glutVideoResizeGet (glut32.@) - */ -extern int glutVideoResizeGet(int arg); -int WINAPI wine_glutVideoResizeGet(int arg) -{ - return glutVideoResizeGet(arg); -} - -/**************************************************** - * glutAddMenuEntry (glut32.@) - */ -extern void glutAddMenuEntry(void *arg1, int arg2); -void WINAPI wine_glutAddMenuEntry(void *arg1, int arg2) -{ - glutAddMenuEntry(arg1, arg2); -} - -/**************************************************** - * glutAddSubMenu (glut32.@) - */ -extern void glutAddSubMenu(void *arg1, int arg2); -void WINAPI wine_glutAddSubMenu(void *arg1, int arg2) -{ - glutAddSubMenu(arg1, arg2); -} - -/**************************************************** - * glutAttachMenu (glut32.@) - */ -extern void glutAttachMenu(int arg); -void WINAPI wine_glutAttachMenu(int arg) -{ - glutAttachMenu(arg); -} - -/**************************************************** - * glutBitmapCharacter (glut32.@) - */ -extern void glutBitmapCharacter(void *arg1, int arg2); -void WINAPI wine_glutBitmapCharacter(void *arg1, int arg2) -{ - glutBitmapCharacter(arg1, arg2); -} - -/**************************************************** - * glutButtonBoxFunc (glut32.@) - */ -extern void glutButtonBoxFunc(void *arg); -void WINAPI wine_glutButtonBoxFunc(void *arg) -{ - glutButtonBoxFunc(arg); -} - -/**************************************************** - * glutChangeToMenuEntry (glut32.@) - */ -extern void glutChangeToMenuEntry(int arg1, void *arg2, int arg3); -void WINAPI wine_glutChangeToMenuEntry(int arg1, void *arg2, int arg3) -{ - glutChangeToMenuEntry(arg1, arg2, arg3); -} - -/**************************************************** - * glutChangeToSubMenu (glut32.@) - */ -extern void glutChangeToSubMenu(int arg1, void *arg2, int arg3); -void WINAPI wine_glutChangeToSubMenu(int arg1, void *arg2, int arg3) -{ - glutChangeToSubMenu(arg1, arg2, arg3); -} - -/**************************************************** - * glutCopyColormap (glut32.@) - */ -extern void glutCopyColormap(int arg); -void WINAPI wine_glutCopyColormap(int arg) -{ - glutCopyColormap(arg); -} - -/**************************************************** - * glutDestroyMenu (glut32.@) - */ -extern void glutDestroyMenu(int arg); -void WINAPI wine_glutDestroyMenu(int arg) -{ - glutDestroyMenu(arg); -} - -/**************************************************** - * glutDestroyWindow (glut32.@) - */ -extern void glutDestroyWindow(int arg); -void WINAPI wine_glutDestroyWindow(int arg) -{ - glutDestroyWindow(arg); -} - -/**************************************************** - * glutDetachMenu (glut32.@) - */ -extern void glutDetachMenu(int arg); -void WINAPI wine_glutDetachMenu(int arg) -{ - glutDetachMenu(arg); -} - -/**************************************************** - * glutDialsFunc (glut32.@) - */ -extern void glutDialsFunc(void *arg); -void WINAPI wine_glutDialsFunc(void *arg) -{ - glutDialsFunc(arg); -} - -/******************************************************* - * glutDisplayFunc (glut32.@) - */ -extern void glutDisplayFunc(void *arg); -void WINAPI wine_glutDisplayFunc(void *arg) -{ - glutDisplayFunc(arg); -} - -/******************************************************* - * glutEntryFunc (glut32.@) - */ -extern void glutEntryFunc(void *arg); -void WINAPI wine_glutEntryFunc(void *arg) -{ - glutEntryFunc(arg); -} - -/******************************************************* - * glutEstablishOverlay (glut32.@) - */ -extern void glutEstablishOverlay(void); -void WINAPI wine_glutEstablishOverlay(void) -{ - glutEstablishOverlay(); -} - -/******************************************************* - * glutForceJoystickFunc (glut32.@) - */ -extern void glutForceJoystickFunc(void); -void WINAPI wine_glutForceJoystickFunc(void) -{ - glutForceJoystickFunc(); -} - -/******************************************************* - * glutFullScreen (glut32.@) - */ -extern void glutFullScreen(void); -void WINAPI wine_glutFullScreen(void) -{ - glutFullScreen(); -} - -/******************************************************* - * glutGameModeString (glut32.@) - */ -extern void glutGameModeString(void *arg); -void WINAPI wine_glutGameModeString(void *arg) -{ - glutGameModeString(arg); -} - -/******************************************************* - * glutHideOverlay (glut32.@) - */ -extern void glutHideOverlay(void); -void WINAPI wine_glutHideOverlay(void) -{ - glutHideOverlay(); -} - -/******************************************************* - * glutHideWindow (glut32.@) - */ -extern void glutHideWindow(void); -void WINAPI wine_glutHideWindow(void) -{ - glutHideWindow(); -} - -/******************************************************* - * glutIconifyWindow (glut32.@) - */ -extern void glutIconifyWindow(void); -void WINAPI wine_glutIconifyWindow(void) -{ - glutIconifyWindow(); -} - -/********************************************* - * glutIdleFunc (glut32.@) - */ -extern void glutIdleFunc(void *arg); -void WINAPI wine_glutIdleFunc(void *arg) -{ - glutIdleFunc(arg); -} - -/********************************************* - * glutIgnoreKeyRepeat (glut32.@) - */ -extern void glutIgnoreKeyRepeat(int arg); -void WINAPI wine_glutIgnoreKeyRepeat(int arg) -{ - glutIgnoreKeyRepeat(arg); -} - -/********************************************** - * glutInitDisplayMode (glut32.@) - */ -extern void glutInitDisplayMode(unsigned int arg); -void WINAPI wine_glutInitDisplayMode(unsigned int arg) -{ - glutInitDisplayMode(arg); -} - -/********************************************** - * glutInitDisplayString (glut32.@) - */ -extern void glutInitDisplayString(void *arg); -void WINAPI wine_glutInitDisplayString(void *arg) -{ - glutInitDisplayString(arg); -} - -/********************************************** - * glutInit (glut32.@) - */ -extern void glutInit(void *arg1, void *arg2); -void WINAPI wine_glutInit(void *arg1, void **arg2) -{ - glutInit(arg1, arg2); -} - -/********************************************** - * __glutInitWithExit (glut32.@) - */ -void WINAPI wine___glutInitWithExit(void *arg1, void *arg2, void (*exitfunc)(int)) -{ - __glutExitFunc = exitfunc; - glutInit(arg1, arg2); -} - -/*********************************************** - * glutInitWindowPosition (glut32.@) - */ -extern void glutInitWindowPosition(int arg1, int arg2); -void WINAPI wine_glutInitWindowPosition(int arg1, int arg2) -{ - glutInitWindowPosition(arg1, arg2); -} - -/*********************************************** - * glutInitWindowSize (glut32.@) - */ -extern void glutInitWindowSize(int arg1, int arg2); -void WINAPI wine_glutInitWindowSize(int arg1, int arg2) -{ - glutInitWindowSize(arg1, arg2); -} - -/*********************************************** - * glutJoystickFunc (glut32.@) - */ -extern void glutJoystickFunc(void *arg1, int arg2); -void WINAPI wine_glutJoystickFunc(void *arg1, int arg2) -{ - glutJoystickFunc(arg1, arg2); -} - -/*********************************************** - * glutKeyboardFunc (glut32.@) - */ -extern void glutKeyboardFunc(void *arg); -void WINAPI wine_glutKeyboardFunc(void *arg) -{ - glutKeyboardFunc(arg); -} - -/*********************************************** - * glutKeyboardUpFunc (glut32.@) - */ -extern void glutKeyboardUpFunc(void *arg); -void WINAPI wine_glutKeyboardUpFunc(void *arg) -{ - glutKeyboardUpFunc(arg); -} - -/*********************************************** - * glutLeaveGameMode (glut32.@) - */ -extern void glutLeaveGameMode(void); -void WINAPI wine_glutLeaveGameMode(void) -{ - glutLeaveGameMode(); -} - -/*********************************************** - * glutMainLoop (glut32.@) - */ -extern void glutMainLoop(void); -void WINAPI wine_glutMainLoop(void) -{ - glutMainLoop(); -} - -/*********************************************** - * glutMenuStateFunc(glut32.@) - */ -extern void glutMenuStateFunc(void *arg); -void WINAPI wine_glutMenuStateFunc(void *arg) -{ - glutMenuStateFunc(arg); -} - -/*********************************************** - * glutMenuStatusFunc (glut32.@) - */ -extern void glutMenuStatusFunc(void *arg); -void WINAPI wine_glutMenuStatusFunc(void *arg) -{ - glutMenuStatusFunc(arg); -} - -/*********************************************** - * glutMotionFunc (glut32.@) - */ -extern void glutMotionFunc(void *arg); -void WINAPI wine_glutMotionFunc(void *arg) -{ - glutMotionFunc(arg); -} - -/******************************************** - * glutMouseFunc (glut32.@) - */ -extern void glutMouseFunc(void *arg); -void WINAPI wine_glutMouseFunc(void *arg) -{ - glutMouseFunc(arg); -} - -/******************************************** - * glutOverlayDisplayFunc (glut32.@) - */ -extern void glutOverlayDisplayFunc(void *arg); -void WINAPI wine_glutOverlayDisplayFunc(void *arg) -{ - glutOverlayDisplayFunc(arg); -} - -/******************************************** - * glutPassiveMotionFunc (glut32.@) - */ -extern void glutPassiveMotionFunc(void *arg); -void WINAPI wine_glutPassiveMotionFunc(void *arg) -{ - glutPassiveMotionFunc(arg); -} - -/******************************************** - * glutPopWindow (glut32.@) - */ -extern void glutPopWindow(void); -void WINAPI wine_glutPopWindow(void) -{ - glutPopWindow(); -} - -/******************************************** - * glutPositionWindow (glut32.@) - */ -extern void glutPositionWindow(int arg1, int arg2); -void WINAPI wine_glutPositionWindow(int arg1, int arg2) -{ - glutPositionWindow(arg1, arg2); -} - -/******************************************** - * glutPostOverlayRedisplay (glut32.@) - */ -extern void glutPostOverlayRedisplay(void); -void WINAPI wine_glutPostOverlayRedisplay(void) -{ - glutPostOverlayRedisplay(); -} - -/******************************************** - * glutPostRedisplay (glut32.@) - */ -extern void glutPostRedisplay(void); -void WINAPI wine_glutPostRedisplay(void) -{ - glutPostRedisplay(); -} - -/******************************************** - * glutPostWindowOverlayRedisplay (glut32.@) - */ -extern void glutPostWindowOverlayRedisplay(int arg); -void WINAPI wine_glutPostWindowOverlayRedisplay(int arg) -{ - glutPostWindowOverlayRedisplay(arg); -} - -/******************************************** - * glutPostWindowRedisplay (glut32.@) - */ -extern void glutPostWindowRedisplay(int arg); -void WINAPI wine_glutPostWindowRedisplay(int arg) -{ - glutPostWindowRedisplay(arg); -} - -/******************************************** - * glutPushWindow (glut32.@) - */ -extern void glutPushWindow(void); -void WINAPI wine_glutPushWindow(void) -{ - glutPushWindow(); -} - -/******************************************** - * glutRemoveMenuItem (glut32.@) - */ -extern void glutRemoveMenuItem(int arg); -void WINAPI wine_glutRemoveMenuItem(int arg) -{ - glutRemoveMenuItem(arg); -} - -/******************************************** - * glutRemoveOverlay (glut32.@) - */ -extern void glutRemoveOverlay(void); -void WINAPI wine_glutRemoveOverlay(void) -{ - glutRemoveOverlay(); -} - -/******************************************** - * glutReportErrors (glut32.@) - */ -extern void glutReportErrors(void); -void WINAPI wine_glutReportErrors(void) -{ - glutReportErrors(); -} - -/******************************************** - * glutReshapeFunc (glut32.@) - */ -extern void glutReshapeFunc(void *arg); -void WINAPI wine_glutReshapeFunc(void *arg) -{ - glutReshapeFunc(arg); -} - -/******************************************** - * glutReshapeWindow (glut32.@) - */ -extern void glutReshapeWindow(int arg1, int arg2); -void WINAPI wine_glutReshapeWindow(int arg1, int arg2) -{ - glutReshapeWindow(arg1, arg2); -} - -/******************************************** - * glutSetColor (glut32.@) - */ -extern void glutSetColor(float arg1, float arg2, float arg3); -void WINAPI wine_glutSetColor(float arg1, float arg2, float arg3) -{ - glutSetColor(arg1, arg2, arg3); -} - -/******************************************** - * glutSetCursor (glut32.@) - */ -extern void glutSetCursor(int arg); -void WINAPI wine_glutSetCursor(int arg) -{ - glutSetCursor(arg); -} - -/******************************************** - * glutSetIconTitle (glut32.@) - */ -extern void glutSetIconTitle(void *arg); -void WINAPI wine_glutSetIconTitle(void *arg) -{ - glutSetIconTitle(arg); -} - -/******************************************** - * glutSetKeyRepeat (glut32.@) - */ -extern void glutSetKeyRepeat(int arg); -void WINAPI wine_glutSetKeyRepeat(int arg) -{ - glutSetKeyRepeat(arg); -} - -/******************************************** - * glutSetMenu (glut32.@) - */ -extern void glutSetMenu(int arg); -void WINAPI wine_glutSetMenu(int arg) -{ - glutSetMenu(arg); -} - -/******************************************** - * glutSetupVideoResizing (glut32.@) - */ -extern void glutSetupVideoResizing(void); -void WINAPI wine_glutSetupVideoResizing(void) -{ -/* glutSetupVideoResizing(); */ -} - -/******************************************** - * glutSetWindow (glut32.@) - */ -extern void glutSetWindow(int arg); -void WINAPI wine_glutSetWindow(int arg) -{ - glutSetWindow(arg); -} - -/******************************************** - * glutSetWindowTitle (glut32.@) - */ -extern void glutSetWindowTitle(void *arg); -void WINAPI wine_glutSetWindowTitle(void *arg) -{ - glutSetWindowTitle(arg); -} - -/******************************************** - * glutShowOverlay (glut32.@) - */ -extern void glutShowOverlay(void); -void WINAPI wine_glutShowOverlay(void) -{ - glutShowOverlay(); -} - -/******************************************** - * glutShowWindow (glut32.@) - */ -extern void glutShowWindow(void); -void WINAPI wine_glutShowWindow(void) -{ - glutShowWindow(); -} - -/********************************************* - * glutSolidCone (glut32.@) - */ -extern void glutSolidCone(double arg1, double arg2, int arg3, int arg4); -void WINAPI wine_glutSolidCone(double arg1, double arg2, int arg3, int arg4) -{ - glutSolidCone(arg1, arg2, arg3, arg4); -} - -/********************************************** - * glutSolidCube (glut32.@) - */ -extern void glutSolidCube(double arg); -void WINAPI wine_glutSolidCube(double arg) -{ - glutSolidCube(arg); -} - -/********************************************** - * glutSolidDodecahedron (glut32.@) - */ -extern void glutSolidDodecahedron(void); -void WINAPI wine_glutSolidDodecahedron(void) -{ - glutSolidDodecahedron(); -} - -/********************************************** - * glutSolidIcosahedron (glut32.@) - */ -extern void glutSolidIcosahedron(void); -void WINAPI wine_glutSolidIcosahedron(void) -{ - glutSolidIcosahedron(); -} - -/********************************************** - * glutSolidOctahedron (glut32.@) - */ -extern void glutSolidOctahedron(void); -void WINAPI wine_glutSolidOctahedron(void) -{ - glutSolidOctahedron(); -} - -/********************************************** - * glutSolidSphere (glut32.@) - */ -extern void glutSolidSphere(double arg1, int arg2, int arg3); -void WINAPI wine_glutSolidSphere(double arg1, int arg2, int arg3) -{ - glutSolidSphere(arg1, arg2, arg3); -} - -/********************************************** - * glutSolidTeapot (glut32.@) - */ -extern void glutSolidTeapot(double arg); -void WINAPI wine_glutSolidTeapot(double arg) -{ - glutSolidTeapot(arg); -} - -/********************************************** - * glutSolidTetrahedron (glut32.@) - */ -extern void glutSolidTetrahedron(void); -void WINAPI wine_glutSolidTetrahedron(void) -{ - glutSolidTetrahedron(); -} - -/********************************************** - * glutSolidTetrahedron (glut32.@) - */ -extern void glutSolidTorus(double arg1, double arg2,int arg3, int arg4); -void WINAPI wine_glutSolidTorus(double arg1, double arg2,int arg3, int arg4) -{ - glutSolidTorus(arg1, arg2, arg3, arg4); -} - -/********************************************** - * glutSpaceballButtonFunc (glut32.@) - */ -extern void glutSpaceballButtonFunc(void *arg); -void WINAPI wine_glutSpaceballButtonFunc(void *arg) -{ - glutSpaceballButtonFunc(arg); -} - -/********************************************** - * glutSpaceballMotionFunc (glut32.@) - */ -extern void glutSpaceballMotionFunc(void *arg); -void WINAPI wine_glutSpaceballMotionFunc(void *arg) -{ - glutSpaceballMotionFunc(arg); -} - -/********************************************** - * glutSpaceballRotateFunc (glut32.@) - */ -extern void glutSpaceballRotateFunc(void *arg); -void WINAPI wine_glutSpaceballRotateFunc(void *arg) -{ - glutSpaceballRotateFunc(arg); -} - -/********************************************** - * glutSpecialFunc (glut32.@) - */ -extern void glutSpecialFunc(void *arg); -void WINAPI wine_glutSpecialFunc(void *arg) -{ - glutSpecialFunc(arg); -} - -/********************************************** - * glutSpecialUpFunc (glut32.@) - */ -extern void glutSpecialUpFunc(void *arg); -void WINAPI wine_glutSpecialUpFunc(void *arg) -{ - glutSpecialUpFunc(arg); -} - -/********************************************** - * glutStopVideoResizing (glut32.@) - */ -extern void glutStopVideoResizing(void); -void WINAPI wine_glutStopVideoResizing(void) -{ - glutStopVideoResizing(); -} - -/********************************************** - * glutStrokeCharacter (glut32.@) - */ -extern void glutStrokeCharacter(void *arg1, int arg2); -void WINAPI wine_glutStrokeCharacter(void *arg1, int arg2) -{ - glutStrokeCharacter(arg1, arg2); -} - -/************************************************** - * glutSwapBuffers (glut32.@) - */ -extern void glutSwapBuffers(void); -void WINAPI wine_glutSwapBuffers(void) -{ - glutSwapBuffers(); -} - -/********************************************** - * glutTabletButtonFunc (glut32.@) - */ -extern void glutTabletButtonFunc(void *arg); -void WINAPI wine_glutTabletButtonFunc(void *arg) -{ - glutTabletButtonFunc(arg); -} - -/********************************************** - * glutTabletMotionFunc (glut32.@) - */ -extern void glutTabletMotionFunc(void *arg); -void WINAPI wine_glutTabletMotionFunc(void *arg) -{ - glutTabletMotionFunc(arg); -} - -/********************************************** - * glutTimerFunc (glut32.@) - */ -extern void glutTimerFunc(int arg1, void *arg2, int arg3); -void WINAPI wine_glutTimerFunc(int arg1, void *arg2, int arg3) -{ - glutTimerFunc(arg1, arg2, arg3); -} - -/********************************************** - * glutUseLayer (glut32.@) - */ -extern void glutUseLayer(int arg); -void WINAPI wine_glutUseLayer(int arg) -{ - glutUseLayer(arg); -} - -/********************************************** - * glutVideoPan (glut32.@) - */ -extern void glutVideoPan(int arg1, int arg2, int arg3, int arg4); -void WINAPI wine_glutVideoPan(int arg1, int arg2, int arg3, int arg4) -{ - glutVideoPan(arg1, arg2, arg3, arg4); -} - -/********************************************** - * glutVideoResize (glut32.@) - */ -extern void glutVideoResize(int arg1, int arg2, int arg3, int arg4); -void WINAPI wine_glutVideoResize(int arg1, int arg2, int arg3, int arg4) -{ - glutVideoResize(arg1, arg2, arg3, arg4); -} - -/********************************************** - * glutVisibilityFunc (glut32.@) - */ -extern void glutVisibilityFunc(void *arg); -void WINAPI wine_glutVisibilityFunc(void *arg) -{ - glutVisibilityFunc(arg); -} - -/********************************************** - * glutWarpPointer (glut32.@) - */ -extern void glutWarpPointer(int arg1, int arg2); -void WINAPI wine_glutWarpPointer(int arg1, int arg2) -{ - glutWarpPointer(arg1, arg2); -} - -/********************************************** - * glutWindowStatusFunc (glut32.@) - */ -extern void glutWindowStatusFunc(void *arg); -void WINAPI wine_glutWindowStatusFunc(void *arg) -{ - glutWindowStatusFunc(arg); -} - -/********************************************** - * glutWireCone (glut32.@) - */ -extern void glutWireCone(double arg1, double arg2, int arg3, int arg4); -void WINAPI wine_glutWireCone(double arg1, double arg2, int arg3,int arg4) -{ - glutWireCone(arg1, arg2, arg3, arg4); -} - -/********************************************** - * glutWireCube (glut32.@) - */ -extern void glutWireCube(double arg); -void WINAPI wine_glutWireCube(double arg) -{ - glutWireCube(arg); -} - -/********************************************** - * glutWireDodecahedron (glut32.@) - */ -extern void glutWireDodecahedron(void); -void WINAPI wine_glutWireDodecahedron(void) -{ - glutWireDodecahedron(); -} - -/********************************************** - * glutWireIcosahedron (glut32.@) - */ -extern void glutWireIcosahedron(void); -void WINAPI wine_glutWireIcosahedron(void) -{ - glutWireIcosahedron(); -} - -/********************************************** - * glutWireOctahedron (glut32.@) - */ -extern void glutWireOctahedron(void); -void WINAPI wine_glutWireOctahedron(void) -{ - glutWireOctahedron(); -} - -/********************************************** - * glutWireSphere (glut32.@) - */ -extern void glutWireSphere(double arg1, int arg2, int arg3); -void WINAPI wine_glutWireSphere(double arg1, int arg2, int arg3) -{ - glutWireSphere(arg1, arg2, arg3); -} - -/********************************************** - * glutWireTeapot (glut32.@) - */ -extern void glutWireTeapot(double arg); -void WINAPI wine_glutWireTeapot(double arg) -{ - glutWireTeapot(arg); -} - -/********************************************** - * glutWireTetrahedron (glut32.@) - */ -extern void glutWireTetrahedron(void); -void WINAPI wine_glutWireTetrahedron(void) -{ - glutWireTetrahedron(); -} - -/*********************************************** - * glutWireTorus (glut32.@) - */ -extern void glutWireTorus(double arg1, double arg2, int arg3, int arg4); -void WINAPI wine_glutWireTorus(double arg1, double arg2, int arg3, int arg4) -{ - glutWireTorus(arg1, arg2, arg3, arg4); -} diff --git a/dlls/glut32/glut32.spec b/dlls/glut32/glut32.spec deleted file mode 100644 index a1f3b207549..00000000000 --- a/dlls/glut32/glut32.spec +++ /dev/null @@ -1,117 +0,0 @@ -@ 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 diff --git a/dlls/make_dlls b/dlls/make_dlls index 7969c52e209..d0876d22f16 100755 --- a/dlls/make_dlls +++ b/dlls/make_dlls @@ -32,7 +32,6 @@ my %altnames = (); my %special_dlls = ( "glu32" => "GLU32FILES", - "glut32" => "GLUT32FILES", "opengl32" => "OPENGLFILES", "wined3d" => "OPENGLFILES", "winex11.drv" => "XFILES",