From 7391e7a0583ac79141d0c08e7efe1a7675204b59 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 31 Aug 2008 23:47:24 +0000 Subject: [PATCH] fix opengl dependency in monolithic build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 2 +- build/bakefiles/opengl.bkl | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index a9683c371b..c8eafa67d1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -12815,7 +12815,7 @@ distclean: clean @COND_MONOLITHIC_0_USE_STC_1@wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP) -@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname) +@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL) @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd) diff --git a/build/bakefiles/opengl.bkl b/build/bakefiles/opengl.bkl index 38950a92cd..e258b812ec 100644 --- a/build/bakefiles/opengl.bkl +++ b/build/bakefiles/opengl.bkl @@ -28,6 +28,7 @@ coredll $(WXLIB_MONO) + monodll $(EXTRALIBS_OPENGL)