X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/390c0cfb06c9576bebef2473a3e3d76bfd2f67a4..cd15bcaf50ead53ccf9d50965312f0dc754affb4:/build/bakefiles/opengl.bkl?ds=sidebyside diff --git a/build/bakefiles/opengl.bkl b/build/bakefiles/opengl.bkl index 2d5353c637..85673828a8 100644 --- a/build/bakefiles/opengl.bkl +++ b/build/bakefiles/opengl.bkl @@ -2,18 +2,18 @@ <!-- $Id$ --> <makefile> - + <!-- ================================================================= --> <!-- OpenGL canvas library --> <!-- ================================================================= --> - + <set var="WXLIBGLDEP_CORE"> <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if> </set> <set var="WXLIBGLDEP_BASE"> <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if> </set> - + <dll id="gldll" template="wx_dll" cond="SHARED=='1' and USE_GUI=='1' and USE_OPENGL=='1'"> <define>WXUSINGDLL</define> @@ -21,28 +21,24 @@ <sources>$(OPENGL_SRC)</sources> <msvc-headers>$(OPENGL_HDR)</msvc-headers> - <!-- link against base and core libs in multilib build: --> + <!-- link against base and core libs in multilib build: --> <sys-lib>$(WXLIBGLDEP_CORE)</sys-lib> <sys-lib>$(WXLIBGLDEP_BASE)</sys-lib> + <depends>basedll</depends> + <depends>coredll</depends> <!-- link against the wxWin library in monolithic build: --> <sys-lib>$(WXLIB_MONO)</sys-lib> + <depends>monodll</depends> - <if cond="FORMAT=='autoconf'"> - <ldflags>$(EXTRALIBS_OPENGL)</ldflags> - </if> - <!-- system libraries on windows: --> - <if cond="FORMAT!='autoconf'"> - <if cond="COMPILER=='wat' or COMPILER=='gcc'"> - <sys-lib>opengl32</sys-lib> - <sys-lib>glu32</sys-lib> - </if> - </if> + <ldlibs>$(EXTRALIBS_OPENGL)</ldlibs> </dll> - + <lib id="gllib" template="wx_lib" cond="SHARED=='0' and USE_GUI=='1' and USE_OPENGL=='1'"> <sources>$(OPENGL_SRC)</sources> <msvc-headers>$(OPENGL_HDR)</msvc-headers> </lib> + <wxshortcut id="wxgl" cond="USE_GUI=='1' and USE_OPENGL=='1'"/> + </makefile>