From bd53731ec373379d06f415dfc1799531fdeb50b9 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 18 Mar 2000 08:15:25 +0000 Subject: [PATCH] When making the DLL with glcanvas then you have to link the dll with the gl libraries. Added a flag to let the makefile do that. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/vc.t | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index 196fcd78f4..3f0cb99c90 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -236,12 +236,16 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS) -out:$(WXDIR)\lib\$(WXLIBNAME).lib << +!if "$(USE_GLCANVAS)" == "1" +GL_LIBS=opengl32.lib glu32.lib +!endif + # Update the dynamic link library $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(link) @<< $(LINKFLAGS) -out:$(WXDIR)\lib\$(WXLIBNAME).dll - $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib + $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib << !endif -- 2.45.2