added LDFLAGS_GL to makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
707a378282
commit
1a31de36a4
@ -331,7 +331,7 @@ $(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
|
||||
# but this seems to result in problems with libwx_gtk being linked in twice
|
||||
$(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
|
||||
@$(INSTALL_DIR) $(build_libdir)
|
||||
$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS)
|
||||
$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(LDFLAGS_GL) $(OPENGLLIBS)
|
||||
|
||||
$(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
|
||||
@$(INSTALL_DIR) $(build_libdir)
|
||||
|
@ -14,6 +14,7 @@
|
||||
# see comment near LDFLAGS at the end of file
|
||||
EXTRALIBS = @LDFLAGS@ @LDFLAGS_VERSIONING@ @LIBS@ @DMALLOC_LIBS@
|
||||
OPENGLLIBS = @OPENGL_LIBS@
|
||||
LDFLAGS_GL = @LDFLAGS_GL@
|
||||
LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
|
||||
|
||||
TOOLKIT = @TOOLKIT@
|
||||
|
Loading…
Reference in New Issue
Block a user