update minimum GTK2 version requirement to 2.6

[wxWidgets.git] / build / bakefiles / opengl.bkl

diff --git a/build/bakefiles/opengl.bkl b/build/bakefiles/opengl.bkl
index d3bc51c5beabd1175a385058eed3e9065dc9ebdc..85673828a88b1909b9f4e088ca707b81b9b69b50 100644 (file)
--- a/build/bakefiles/opengl.bkl
+++ b/build/bakefiles/opengl.bkl
@@ -2,18 +2,18 @@
 <!-- $Id$ -->
 
 <makefile>
 <!-- $Id$ -->
 
 <makefile>

-    
+

     <!-- ================================================================= -->
     <!--                         OpenGL canvas library                     -->
     <!-- ================================================================= -->
     <!-- ================================================================= -->
     <!--                         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>
     <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>
     <dll id="gldll" template="wx_dll"
          cond="SHARED=='1' and USE_GUI=='1' and USE_OPENGL=='1'">
         <define>WXUSINGDLL</define>


@@ -21,21 +21,24 @@
         <sources>$(OPENGL_SRC)</sources>
         <msvc-headers>$(OPENGL_HDR)</msvc-headers>
 
         <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>
         <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>

 
         <ldlibs>$(EXTRALIBS_OPENGL)</ldlibs>
     </dll>
 
         <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>
 
     <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>
 </makefile>