From 216c39aeda07334a18885a78fe23bdc3a2fe2523 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 15 Jun 2003 19:37:51 +0000 Subject: [PATCH] fixed build problems when OpenGL libs were not in the same directory git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 2 +- docs/changes.txt | 4 ++++ src/make.env.in | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index a406575fe4..6c13e78df1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -324,7 +324,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) -d $(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) -d $(build_libdir) diff --git a/docs/changes.txt b/docs/changes.txt index c5f7e0b14b..b59bfb50cf 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -187,6 +187,10 @@ Generic: - wxListCtrl: respect wxLC_NO_HEADER style when inserting first column +Unix: + +- fixed build problems with OpenGL when libGL(U) were in different directories + 2.4.1 ----- diff --git a/src/make.env.in b/src/make.env.in index 94a973aeef..c2715de737 100644 --- 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@ +LDFLAGS_GL = @LDFLAGS_GL@ LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS} TOOLKIT = @TOOLKIT@