From 224b1f5cf117e2c365575452772fec6f025f94ca Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 8 Jun 2002 18:43:21 +0000 Subject: [PATCH] don't link in libwx_gtk twice when linking apps using OpenGL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index acb1f207f7..edca976e54 100644 --- a/Makefile.in +++ b/Makefile.in @@ -318,9 +318,11 @@ $(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS) @$(INSTALL) -d $(build_libdir) $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS) +# NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line +# 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) -d $(build_libdir) - $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o -L$(build_libdir) @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS) + $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS) $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES) @$(INSTALL) -d $(build_libdir) -- 2.45.2