File/font/colour/dir picker fixes for GTK Universal

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

diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen
index 3dcc1ce4b669c1a6d3e9453d731e121f0fc0e512..97c32e6071a81ea9a78745a6d8d04485a46df70a 100644 (file)
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -14,20 +14,21 @@
          </bakefile-gen>
 
     Reasons why these formats are disabled (and so not in CVS):
          </bakefile-gen>
 
     Reasons why these formats are disabled (and so not in CVS):

-    
-    dmars     - In beta testing, will be added when it stabilizes.
+

     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.
     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 intergrate well and won't be used by most Unix people.
+    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,cbx_unix,cbuilderx</disable-formats>
-    

 
 

-    <!-- These wildcards match all .bkl files in wxWindows tree: -->
+    <disable-formats>dmars,dmars_smake,msevc4prj,cbx_unix,cbuilderx</disable-formats>
+
+
+    <!-- These wildcards match all .bkl files in wxWidgets tree: -->

     <input>
         wx.bkl
         ../../contrib/build/*/*.bkl
     <input>
         wx.bkl
         ../../contrib/build/*/*.bkl


@@ -49,33 +50,45 @@
 
     <!-- List of output formats to generate: -->
     <add-formats>
 
     <!-- List of output formats to generate: -->
     <add-formats>

-        autoconf,borland,dmars,mingw,msvc,msvc6prj,watcom,cbuilderx,cbx_unix
+        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix

     </add-formats>
     </add-formats>

-    
+

     <del-formats files="../../samples/*.bkl">
     <del-formats files="../../samples/*.bkl">

-        autoconf,msvc6prj,cbuilderx,cbx_unix
+        autoconf,msvc6prj,msevc4prj,cbuilderx,cbx_unix

     </del-formats>
     <del-formats files="../../demos/*.bkl">
     </del-formats>
     <del-formats files="../../demos/*.bkl">

-        msvc6prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix

     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">
     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">

-        msvc6prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix

     </del-formats>
     <del-formats files="../../samples/mobile/mobile_samples.bkl">
     </del-formats>
     <del-formats files="../../samples/mobile/mobile_samples.bkl">

-        msvc6prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix

     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">
     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">

-        msvc6prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix

     </del-formats>
     <del-formats files="../../utils/*.bkl">
     </del-formats>
     <del-formats files="../../utils/*.bkl">

-        msvc6prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix

     </del-formats>
 
     </del-formats>
 

-    
+    <!-- WinCE can't have console apps: -->
+    <del-formats files="../../samples/console/*">msevc4prj</del-formats>
+    <del-formats files="../../utils/HelpGen/src/*">msevc4prj</del-formats>
+    <del-formats files="../../utils/wxrc/*">msevc4prj</del-formats>
+    <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,watcom,cbuilderx,cbx_unix
+    </del-formats>
+
+

     <!-- Default flags (for all formats and bakefiles): -->
     <add-flags>-Iformats</add-flags>
     <!-- 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
     <!-- Directories where the files go: -->
     <add-flags files="wx.bkl" formats="autoconf">
         -o../../Makefile.in


@@ -83,6 +96,9 @@
     <add-flags files="wx.bkl" formats="borland">
         -o../msw/makefile.bcc
     </add-flags>
     <add-flags files="wx.bkl" formats="borland">
         -o../msw/makefile.bcc
     </add-flags>

+    <add-flags files="wx.bkl" formats="dmars_smake">
+        -o../msw/makefile.dms
+    </add-flags>

     <add-flags files="wx.bkl" formats="dmars">
         -o../msw/makefile.dmc
     </add-flags>
     <add-flags files="wx.bkl" formats="dmars">
         -o../msw/makefile.dmc
     </add-flags>


@@ -98,6 +114,9 @@
     <add-flags files="wx.bkl" formats="msvc6prj">
         -o../msw/wx.dsw
     </add-flags>
     <add-flags files="wx.bkl" formats="msvc6prj">
         -o../msw/wx.dsw
     </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="wx.bkl" formats="cbuilderx">
         -o../../wx.cbx
     </add-flags>


@@ -112,11 +131,11 @@
         -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
     </add-flags>
     <add-flags files="../../contrib/build/*/*.bkl"
         -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
     </add-flags>
     <add-flags files="../../contrib/build/*/*.bkl"

-               formats="mingw,borland,dmars,watcom,msvc,msvc6prj">
+               formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj">

         -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
     </add-flags>
 
         -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
     </add-flags>
 

-    
+

 
     <!-- Format specific settings: -->
     <add-flags formats="autoconf">
 
     <!-- Format specific settings: -->
     <add-flags formats="autoconf">


@@ -127,22 +146,25 @@
     <add-flags formats="wx24dsp">
         -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
     </add-flags>
     <add-flags formats="wx24dsp">
         -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
     </add-flags>

-    
+

     <add-formats files="wx.bkl">rpmspec</add-formats>
 
 
     <!-- Makefile specific settings: -->
 
     <add-formats files="wx.bkl">rpmspec</add-formats>
 
 
     <!-- Makefile specific settings: -->
 

-    <add-flags formats="borland,dmars,mingw,msvc,watcom">
+    <add-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom">

         -DWRITE_OPTIONS_FILE=0
     </add-flags>
     <del-flags files="wx.bkl">
         -DWRITE_OPTIONS_FILE=0
     </del-flags>
         -DWRITE_OPTIONS_FILE=0
     </add-flags>
     <del-flags files="wx.bkl">
         -DWRITE_OPTIONS_FILE=0
     </del-flags>

-    
+

     <add-flags files="wx.bkl" formats="borland">
         -DOPTIONS_FILE=config.bcc
     </add-flags>
     <add-flags files="wx.bkl" formats="borland">
         -DOPTIONS_FILE=config.bcc
     </add-flags>

+    <add-flags files="wx.bkl" formats="dmars_smake">
+        -DOPTIONS_FILE=config.dms
+    </add-flags>

     <add-flags files="wx.bkl" formats="dmars">
         -DOPTIONS_FILE=config.dmc
     </add-flags>
     <add-flags files="wx.bkl" formats="dmars">
         -DOPTIONS_FILE=config.dmc
     </add-flags>


@@ -160,10 +182,13 @@
     <add-flags files="../../*/*/*">-DWXTOPDIR=../../</add-flags>
     <add-flags files="../../*/*/*/*">-DWXTOPDIR=../../../</add-flags>
     <add-flags files="../../*/*/*/*/*">-DWXTOPDIR=../../../../</add-flags>
     <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>
     <add-flags files="../../*/*" formats="borland">
         -DOPTIONS_FILE=../build/msw/config.bcc
     </add-flags>

+    <add-flags files="../../*/*" formats="dmars_smake">
+        -DOPTIONS_FILE=../build/msw/config.dms
+    </add-flags>

     <add-flags files="../../*/*" formats="dmars">
         -DOPTIONS_FILE=../build/msw/config.dmc
     </add-flags>
     <add-flags files="../../*/*" formats="dmars">
         -DOPTIONS_FILE=../build/msw/config.dmc
     </add-flags>


@@ -179,6 +204,9 @@
     <add-flags files="../../*/*/*" formats="borland">
         -DOPTIONS_FILE=../../build/msw/config.bcc
     </add-flags>
     <add-flags files="../../*/*/*" formats="borland">
         -DOPTIONS_FILE=../../build/msw/config.bcc
     </add-flags>

+    <add-flags files="../../*/*/*" formats="dmars_smake">
+        -DOPTIONS_FILE=../../build/msw/config.dms
+    </add-flags>

     <add-flags files="../../*/*/*" formats="dmars">
         -DOPTIONS_FILE=../../build/msw/config.dmc
     </add-flags>
     <add-flags files="../../*/*/*" formats="dmars">
         -DOPTIONS_FILE=../../build/msw/config.dmc
     </add-flags>


@@ -194,6 +222,9 @@
     <add-flags files="../../*/*/*/*" formats="borland">
         -DOPTIONS_FILE=../../../build/msw/config.bcc
     </add-flags>
     <add-flags files="../../*/*/*/*" formats="borland">
         -DOPTIONS_FILE=../../../build/msw/config.bcc
     </add-flags>

+    <add-flags files="../../*/*/*/*" formats="dmars_smake">
+        -DOPTIONS_FILE=../../../build/msw/config.dms
+    </add-flags>

     <add-flags files="../../*/*/*/*" formats="dmars">
         -DOPTIONS_FILE=../../../build/msw/config.dmc
     </add-flags>
     <add-flags files="../../*/*/*/*" formats="dmars">
         -DOPTIONS_FILE=../../../build/msw/config.dmc
     </add-flags>


@@ -209,6 +240,9 @@
     <add-flags files="../../*/*/*/*/*" formats="borland">
         -DOPTIONS_FILE=../../../../build/msw/config.bcc
     </add-flags>
     <add-flags files="../../*/*/*/*/*" formats="borland">
         -DOPTIONS_FILE=../../../../build/msw/config.bcc
     </add-flags>

+    <add-flags files="../../*/*/*/*/*" formats="dmars_smake">
+        -DOPTIONS_FILE=../../../../build/msw/config.dms
+    </add-flags>

     <add-flags files="../../*/*/*/*/*" formats="dmars">
         -DOPTIONS_FILE=../../../../build/msw/config.dmc
     </add-flags>
     <add-flags files="../../*/*/*/*/*" formats="dmars">
         -DOPTIONS_FILE=../../../../build/msw/config.dmc
     </add-flags>