allow building wxXRC with wxUSE_HTML=0: make linking work in absence of wxHTML library

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

diff --git a/build/bakefiles/opengl.bkl b/build/bakefiles/opengl.bkl
index 782b1f738b36d6f3f6a6833e02aeeb2fffb907ac..d3bc51c5beabd1175a385058eed3e9065dc9ebdc 100644 (file)
--- a/build/bakefiles/opengl.bkl
+++ b/build/bakefiles/opengl.bkl
@@ -7,26 +7,35 @@
     <!--                         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>

+        <msvc-headers>$(OPENGL_HDR)</msvc-headers>

 
         <!-- link against base and core libs in multilib build: --> 
 
         <!-- link against base and core libs in multilib build: --> 

-        <library>coredll</library>
-        <library>basedll</library>
+        <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>
 
         <!-- link against the wxWin library in monolithic build: -->
         <sys-lib>$(WXLIB_MONO)</sys-lib>
 

-        <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>
 
 </makefile>
     </lib>
 
 </makefile>