Applied patch [ 795491 ] Multimon sample compatibility with various conditions

[wxWidgets.git] / contrib / build / ogl / ogl.bkl

diff --git a/contrib/build/ogl/ogl.bkl b/contrib/build/ogl/ogl.bkl
index dc263b4c9ac0d57be31d42cb6ac16644f66f271d..44aa5e89c2ea037eeabcba9fba2936fcc82b1511 100644 (file)
--- a/contrib/build/ogl/ogl.bkl
+++ b/contrib/build/ogl/ogl.bkl
@@ -43,7 +43,6 @@
     <dll id="ogldll" template="wx_contrib_dll" cond="SHARED=='1'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_OGL</define>
-       <define>wxUSE_DEPRECATED=0</define>  <!-- this is a hack, we should do the RightThing later -->
         <sources>$(OGL_SRC)</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
@@ -52,5 +51,7 @@
     <lib id="ogllib" template="wx_contrib_lib" cond="SHARED=='0'">
         <sources>$(OGL_SRC)</sources>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">ogl=ogllib+ogldll</set>
 
 </makefile>