added LDFLAGS_GL to makefiles

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 203b0a236631d2f4d80bfc7fff802b243af38be6..c88383a0b90d4e2401164fc45d60de2f25c588a7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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)
 #     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)
 
 $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
        @$(INSTALL_DIR) $(build_libdir)

diff --git a/src/make.env.in b/src/make.env.in
index d72dc2c558fe7e2116bacaad90beb07123670a8a..0604cbca52b86764200fa35848ddc5e2bbac7a0d 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -14,6 +14,7 @@
 # see comment near LDFLAGS at the end of file
 EXTRALIBS = @LDFLAGS@ @LDFLAGS_VERSIONING@ @LIBS@ @DMALLOC_LIBS@
 OPENGLLIBS = @OPENGL_LIBS@
 # 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@
 LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
 
 TOOLKIT = @TOOLKIT@