Added build/msw/wx_propgrid.dsp to vc manifest (I hope this fixes #10564)

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

diff --git a/build/bakefiles/opengl.bkl b/build/bakefiles/opengl.bkl
index 25088ee47f2fc8d554af5cb18bf874c6efad0f93..e258b812ec7aa9b6c5c916932c1dbf27617badc3 100644 (file)
--- a/build/bakefiles/opengl.bkl
+++ b/build/bakefiles/opengl.bkl
@@ -19,21 +19,26 @@
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_GL</define>
         <sources>$(OPENGL_SRC)</sources>
         <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: --> 
         <sys-lib>$(WXLIBGLDEP_CORE)</sys-lib>
         <sys-lib>$(WXLIBGLDEP_BASE)</sys-lib>
 
         <!-- 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>
         <!-- 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>
+        <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>