Merge in from trunk r67662 to r64801

[wxWidgets.git] / samples / samples.bkl

diff --git a/samples/samples.bkl b/samples/samples.bkl
index 932d95063fff8edc20c34817abb5c9305bcdc63b..88e97bdef82caa8db48cf193cc297498ecf7ed8e 100644 (file)
--- a/samples/samples.bkl
+++ b/samples/samples.bkl
@@ -1,37 +1,43 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->
 <makefile>
 
     <include file="../build/bakefiles/config.bkl"/>
 
-    <template id="sub">
+    <template id="optsub">
         <dir>$(id)</dir>
+    </template>
+
+    <template id="sub" template="optsub">
         <dependency-of>all</dependency-of>
     </template>
 
     <!-- all samples are enumerated here: -->
     <subproject id="access" template="sub"/>
+    <subproject id="animate" template="sub"/>
     <subproject id="artprov" template="sub"/>
+    <subproject id="aui" template="sub"/>
     <subproject id="calendar" template="sub"/>
     <subproject id="caret" template="sub"/>
-    <subproject id="checklst" template="sub"/>
-    <subproject id="config" template="sub"/>
+    <subproject id="clipboard" template="sub"/>
+    <subproject id="collpane" template="sub"/>
     <subproject id="combo" template="sub"/>
+    <subproject id="config" template="sub"/>
     <subproject id="console" template="sub"/>
     <subproject id="controls" template="sub"/>
-    <subproject id="db" template="sub"/>
+    <subproject id="dataview" template="sub"/>
     <subproject id="dialogs" template="sub"/>
     <subproject id="dialup" template="sub"/>
     <subproject id="display" template="sub"/>
+    <subproject id="dll" template="sub"/>
     <subproject id="dnd" template="sub"/>
     <subproject id="docview" template="sub"/>
-    <subproject id="docvwmdi" template="sub"/>
     <subproject id="dragimag" template="sub"/>
     <subproject id="drawing" template="sub"/>
-    <subproject id="dynamic" template="sub"/>
     <subproject id="erase" template="sub"/>
     <subproject id="event" template="sub"/>
-    <subproject id="exec" template="sub"/>
     <subproject id="except" template="sub"/>
+    <subproject id="exec" template="sub"/>
     <subproject id="font" template="sub"/>
     <subproject id="grid" template="sub"/>
     <subproject id="help" template="sub"/>
@@ -43,48 +49,61 @@
     <subproject id="joytest" template="sub"/>
     <subproject id="keyboard" template="sub"/>
     <subproject id="layout" template="sub"/>
-    <subproject id="listbox" template="sub"/>
     <subproject id="listctrl" template="sub"/>
     <subproject id="mdi" template="sub"/>
     <subproject id="mediaplayer" template="sub"/>
-    <subproject id="memcheck" template="sub"/>
     <subproject id="menu" template="sub"/>
-    <subproject id="minifram" template="sub"/>
     <subproject id="minimal" template="sub"/>
-    <subproject id="mobile" template="sub"/>
-    <subproject id="multimon" template="sub"/>
     <subproject id="nativdlg" template="sub"/>
     <subproject id="notebook" template="sub"/>
     <subproject id="oleauto" template="sub"/>
     <subproject id="opengl" template="sub"/>
     <subproject id="ownerdrw" template="sub"/>
-    <subproject id="png" template="sub"/>
     <subproject id="popup" template="sub"/>
+    <subproject id="power" template="sub"/>
     <subproject id="printing" template="sub"/>
-    <subproject id="propsize" template="sub"/>
+    <subproject id="propgrid" template="sub"/>
     <subproject id="regtest" template="sub"/>
     <subproject id="render" template="sub"/>
-    <subproject id="rotate" template="sub"/>
+    <subproject id="ribbon" template="sub"/>
+    <subproject id="richtext" template="sub"/>
     <subproject id="sashtest" template="sub"/>
     <subproject id="scroll" template="sub"/>
-    <subproject id="scrollsub" template="sub"/>
     <subproject id="shaped" template="sub"/>
     <subproject id="sockets" template="sub"/>
     <subproject id="sound" template="sub"/>
     <subproject id="splash" template="sub"/>
     <subproject id="splitter" template="sub"/>
     <subproject id="statbar" template="sub"/>
+    <subproject id="stc" template="sub"/>
+    <subproject id="svg" template="sub"/>
+    <subproject id="taborder" template="sub"/>
     <subproject id="taskbar" template="sub"/>
     <subproject id="text" template="sub"/>
     <subproject id="thread" template="sub"/>
     <subproject id="toolbar" template="sub"/>
     <subproject id="treectrl" template="sub"/>
     <subproject id="typetest" template="sub"/>
+    <subproject id="uiaction" template="sub"/>
     <subproject id="validate" template="sub"/>
     <subproject id="vscroll" template="sub"/>
+    <subproject id="web" template="sub"/>
     <subproject id="widgets" template="sub"/>
     <subproject id="wizard" template="sub"/>
-    <!-- Put samples most likely to fail at the end -->
-    <subproject id="mfc" template="sub"/>
+    <subproject id="wrapsizer" template="sub"/>
+    <subproject id="xrc" template="sub"/>
+
+    <!--
+        These samples don't always build (they need non-default wxWidgets
+        configuration or some 3rd party library being installed) so don't build
+        them by default by using "optsub" template instead of "sub" one and
+        some of them also require MSVC compiler so don't use them with the
+        other ones.
+     -->
+    <if cond="FORMAT[:3] == 'msv'">
+        <subproject id="flash" template="optsub"/>
+        <subproject id="mfc" template="optsub"/>
+    </if>
+    <subproject id="memcheck" template="optsub"/>
 
 </makefile>