Applied patch which solved conflicts between wxWidgets

[wxWidgets.git] / samples / help / help.bkl

diff --git a/samples/help/help.bkl b/samples/help/help.bkl
index 40853aca62df27a6b08ae3694dfbbdaa04d28a4c..2d0a70fb88f77804053d8886f2fd63d91cdcdcbc 100644 (file)
--- a/samples/help/help.bkl
+++ b/samples/help/help.bkl
@@ -5,8 +5,56 @@
 
     <exe id="help" template="wx_sample" template_append="wx_append">
         <sources>demo.cpp</sources>
+        <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
-        <win32-res>help.rc</win32-res>
+        <wx-lib>base</wx-lib>
+        <win32-res>demo.rc</win32-res>
     </exe>
 
+    <wx-data id="data">
+        <files>
+            back.gif
+            books.gif
+            bullet.bmp
+            contents.gif
+            cshelp.txt
+            doc.chm
+            doc.cnt
+            doc.hhc
+            doc.hhk
+            doc.hhp
+            doc.hlp
+            doc.hpj
+            doc.zip
+            forward.gif
+            up.gif
+        </files>
+    </wx-data>
+
+    <wx-data id="data_doc">
+        <dstdir>$(BUILDDIR)/doc</dstdir>
+        <srcdir>$(SRCDIR)/doc</srcdir>
+        <files>
+            aindex.html
+            ClassGraph.class
+            ClassGraphPanel.class
+            ClassLayout.class
+            down.gif
+            dxxgifs.tex
+            HIER.html
+            HIERjava.html
+            icon1.gif
+            icon2.gif
+            index.html
+            logo.gif
+            NavigatorButton.class
+            USE_HELP.html
+            wx204.htm
+            wx34.htm
+            wxExtHelpController.html
+            wxhelp.map
+            wx.htm
+        </files>
+    </wx-data>
+
 </makefile>