Modified generic wxTreeCtrl to work under non-Unix platforms simultaneously

[wxWidgets.git] / distrib / msw / tmake / vc.t

diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index 5a2ffd16466430f104c0554e998563b786494abc..4422ad02672b80d9f059c915f73560a13c91c564 100644 (file)
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -235,6 +235,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
 
 !if "$(USE_GLCANVAS)" == "1"
 GL_LIBS=opengl32.lib glu32.lib
 
 !if "$(USE_GLCANVAS)" == "1"
 GL_LIBS=opengl32.lib glu32.lib

+GL_LIBS_DELAY=/delayload:opengl32.dll

 !endif
 
 # Update the dynamic link library
 !endif
 
 # Update the dynamic link library


@@ -246,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
        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 /delayload:opengl32.dll
+       /delayload:oleaut32.dll /delayload:rpcrt4.dll $(GL_LIBS_DELAY)

 <<
 
 !endif
 
 <<
 
 !endif
 

+# /delayload:winmm.dll # Removed because it can cause a crash for some people

 
 ########################################################
 # Windows-specific objects
 
 ########################################################
 # Windows-specific objects