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
This commit is contained in:
parent
4107335720
commit
bd53731ec3
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user