From 9e85f5ec6cd4fa03839f30084975c8c89eb5ad2f Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 2 Aug 2000 06:35:58 +0000 Subject: [PATCH] Removed winmm.dll from delayload list. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/vc.t | 3 ++- src/msw/makefile.vc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index 33a95027b2..4422ad0267 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -247,11 +247,12 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) delayimp.lib /delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll /delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll - /delayload:oleaut32.dll /delayload:rpcrt4.dll /delayload:winmm.dll $(GL_LIBS_DELAY) + /delayload:oleaut32.dll /delayload:rpcrt4.dll $(GL_LIBS_DELAY) << !endif +# /delayload:winmm.dll # Removed because it can cause a crash for some people ######################################################## # Windows-specific objects diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 60b01a0e91..5ebec70f68 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -454,11 +454,12 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) delayimp.lib /delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll /delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll - /delayload:oleaut32.dll /delayload:rpcrt4.dll /delayload:winmm.dll $(GL_LIBS_DELAY) + /delayload:oleaut32.dll /delayload:rpcrt4.dll $(GL_LIBS_DELAY) << !endif +# /delayload:winmm.dll # Removed because it can cause a crash for some people ######################################################## # Windows-specific objects -- 2.45.2