compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/ogl/ogledit/ogledit.bkl b/contrib/samples/ogl/ogledit/ogledit.bkl
index 6ae633ae2f5744c2b62132de81e62685fbb871a8..0b161ddf843bc21a8fa90d3bcd1754a79f679e50 100644 (file)
--- a/contrib/samples/ogl/ogledit/ogledit.bkl
+++ b/contrib/samples/ogl/ogledit/ogledit.bkl
@@ -2,6 +2,7 @@
 <makefile>
 
     <include file="../../../../build/bakefiles/common_samples.bkl"/>
+    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
     <include file="../../../../build/bakefiles/common_contrib.bkl"/>
 
     <exe id="ogledit" template="wx_contrib_sample" template_append="wx_append">
@@ -12,6 +13,7 @@
             palette.cpp
         </sources>
         <wx-lib>ogl</wx-lib>
+        <wx-lib>deprecated</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>ogledit.rc</win32-res>

diff --git a/contrib/samples/ogl/studio/studio.bkl b/contrib/samples/ogl/studio/studio.bkl
index f9105f664f2737ed30ebcb39ff9cbda230a14e13..ba23e7d21cd2d730dbc189a851e3ea3c412fa04d 100644 (file)
--- a/contrib/samples/ogl/studio/studio.bkl
+++ b/contrib/samples/ogl/studio/studio.bkl
@@ -2,6 +2,7 @@
 <makefile>
 
     <include file="../../../../build/bakefiles/common_samples.bkl"/>
+    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
     <include file="../../../../build/bakefiles/common_contrib.bkl"/>
 
     <exe id="ogledit" template="wx_contrib_sample" template_append="wx_append">