Removed queuedResize code again as GTK+ does this internally already

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

diff --git a/build/bakefiles/opengl.bkl b/build/bakefiles/opengl.bkl
index 6ecbe8321f9f589eb52fd6ce24cd312db1656dbf..e258b812ec7aa9b6c5c916932c1dbf27617badc3 100644 (file)
--- a/build/bakefiles/opengl.bkl
+++ b/build/bakefiles/opengl.bkl
@@ -7,22 +7,38 @@
     <!--                         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>
+    

     <dll id="gldll" template="wx_dll"
          cond="SHARED=='1' and USE_GUI=='1' and USE_OPENGL=='1'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_GL</define>
         <sources>$(OPENGL_SRC)</sources>
     <dll id="gldll" template="wx_dll"
          cond="SHARED=='1' and USE_GUI=='1' and USE_OPENGL=='1'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_GL</define>
         <sources>$(OPENGL_SRC)</sources>

-        <library>coredll</library>
-        <library>basedll</library>
+        <msvc-headers>$(OPENGL_HDR)</msvc-headers>
+
+        <!-- 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>$(OPENGL_LIBS)</ldflags>
-        </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>
     </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>
 

+    <wxshortcut id="wxgl" cond="USE_GUI=='1' and USE_OPENGL=='1'"/>
+

 </makefile>
 </makefile>