added support for ellipsization and markup in wxStaticText (modified patch 1629946)

[wxWidgets.git] / build / bakefiles / Bakefiles.bkgen

diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen
index 35a6f432e83293b4acaa53de521d948cb1c3897e..3566b49ae824ca8ee17a5e95600ff15bdbb7a023 100644 (file)
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -14,20 +14,13 @@
          </bakefile-gen>
 
     Reasons why these formats are disabled (and so not in CVS):
-    
-    dmars     - In beta testing, will be added when it stabilizes.
-    dmars_smake     - ditto
-    msevc4prj - ditto
-    cbuilderx - Generated projects are too bad to be included in CVS. Please
-                *do not* enable this format until FIXMEs in .bkl files related
-                to cbuilderx are addressed. In particular, the project must
-                be placed into build/msw(?) directory and store object files
-                in its subdirectory and it must copy setup.h as others do.
-    cbx_unix  - Doesn't integrate well and won't be used by most Unix people.
+
+    dmars, dmars_smake, msevc4prj - These are generated at release time and
+                we don't want to clutter the source tree with these files.
     -->
-    
-    <disable-formats>dmars,dmars_smake,cbx_unix,cbuilderx,msevc4prj</disable-formats>
-    
+
+    <disable-formats>dmars,dmars_smake,msevc4prj</disable-formats>
+
 
     <!-- These wildcards match all .bkl files in wxWidgets tree: -->
     <input>
@@ -51,26 +44,26 @@
 
     <!-- List of output formats to generate: -->
     <add-formats>
-        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
+        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom
     </add-formats>
-    
+
     <del-formats files="../../samples/*.bkl">
-        autoconf,msvc6prj,msevc4prj,cbuilderx,cbx_unix
+        autoconf,msvc6prj,msevc4prj,msvs2005prj
     </del-formats>
     <del-formats files="../../demos/*.bkl">
-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,msvs2005prj
     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">
-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,msvs2005prj
     </del-formats>
     <del-formats files="../../samples/mobile/mobile_samples.bkl">
-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,msvs2005prj
     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">
-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,msvs2005prj
     </del-formats>
     <del-formats files="../../utils/*.bkl">
-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,msvs2005prj
     </del-formats>
 
     <!-- WinCE can't have console apps: -->
@@ -80,11 +73,16 @@
     <del-formats files="../../contrib/utils/wxrc/*">msevc4prj</del-formats>
     <del-formats files="../../tests/*">msevc4prj</del-formats>
 
-    
+    <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
+    <del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
+        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom
+    </del-formats>
+
+
     <!-- Default flags (for all formats and bakefiles): -->
     <add-flags>-Iformats</add-flags>
-    
-    
+
+
     <!-- Directories where the files go: -->
     <add-flags files="wx.bkl" formats="autoconf">
         -o../../Makefile.in
@@ -110,39 +108,27 @@
     <add-flags files="wx.bkl" formats="msvc6prj">
         -o../msw/wx.dsw
     </add-flags>
+    <add-flags files="wx.bkl" formats="msvs2005prj">
+        -o../msw/wx.sln
+    </add-flags>
     <add-flags files="wx.bkl" formats="msevc4prj">
         -o../wince/wx.vcw
     </add-flags>
-    <add-flags files="wx.bkl" formats="cbuilderx">
-        -o../../wx.cbx
-    </add-flags>
     <add-flags files="../../contrib/build/*/*.bkl" formats="autoconf">
         -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/Makefile.in
     </add-flags>
-    <add-flags files="../../contrib/build/*/*.bkl" formats="cbx_unix">
-        -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT)Unix.cbx
-    </add-flags>
-    <!-- FIXME: don't do this once it is possible (new CBX version) -->
-    <add-flags files="../../contrib/build/*/*.bkl" formats="cbuilderx">
-        -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
-    </add-flags>
     <add-flags files="../../contrib/build/*/*.bkl"
-               formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj">
+               formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj,msvs2005prj">
         -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
     </add-flags>
 
-    
+
 
     <!-- Format specific settings: -->
     <add-flags formats="autoconf">
         -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4
     </add-flags>
 
-    <add-formats files="wx.bkl">wx24dsp</add-formats>
-    <add-flags formats="wx24dsp">
-        -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
-    </add-flags>
-    
     <add-formats files="wx.bkl">rpmspec</add-formats>
 
 
@@ -154,7 +140,7 @@
     <del-flags files="wx.bkl">
         -DWRITE_OPTIONS_FILE=0
     </del-flags>
-    
+
     <add-flags files="wx.bkl" formats="borland">
         -DOPTIONS_FILE=config.bcc
     </add-flags>
@@ -178,7 +164,7 @@
     <add-flags files="../../*/*/*">-DWXTOPDIR=../../</add-flags>
     <add-flags files="../../*/*/*/*">-DWXTOPDIR=../../../</add-flags>
     <add-flags files="../../*/*/*/*/*">-DWXTOPDIR=../../../../</add-flags>
-    
+
     <add-flags files="../../*/*" formats="borland">
         -DOPTIONS_FILE=../build/msw/config.bcc
     </add-flags>
@@ -252,6 +238,15 @@
         -DOPTIONS_FILE=../../../../build/msw/config.wat
     </add-flags>
 
+    
+    <!-- Makefiles for out-of-tree building of samples on Unix: -->
+    <add-formats files="../../samples/*/*.bkl,../../samples/*/*/*.bkl">
+        gnu
+    </add-formats>
+    <add-flags files="../../samples/*/*.bkl,../../samples/*/*/*.bkl"
+               formats="gnu">
+        -DOUT_OF_TREE_MAKEFILES=1 -o$(INPUT_FILE_DIR)/makefile.unx
+    </add-flags>
 
     <!-- Personal customizations (not in CVS): -->
     <include file="Bakefiles.local.bkgen" ignore_missing="1"/>