Changed type of bitmaps. RC of DMC reported 'is not a valid Windows 3.0 or OS/2 1...

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

diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen
index e60d4d5b4067458e61f33efe3ee5436271ca88f3..01d55397df46728ec879a817804852f654a2f457 100644 (file)
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -16,6 +16,7 @@
     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
@@ -25,10 +26,10 @@
     cbx_unix  - Doesn't intergrate well and won't be used by most Unix people.
     -->
     
-    <disable-formats>dmars,cbx_unix,cbuilderx,msevc4prj</disable-formats>
+    <disable-formats>dmars,dmars_smake,cbx_unix,cbuilderx,msevc4prj</disable-formats>
     
 
-    <!-- These wildcards match all .bkl files in wxWindows tree: -->
+    <!-- These wildcards match all .bkl files in wxWidgets tree: -->
     <input>
         wx.bkl
         ../../contrib/build/*/*.bkl
@@ -50,7 +51,7 @@
 
     <!-- List of output formats to generate: -->
     <add-formats>
-        autoconf,borland,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
+        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
     </add-formats>
     
     <del-formats files="../../samples/*.bkl">
@@ -90,6 +91,9 @@
     <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>
@@ -122,7 +126,7 @@
         -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,msevc4prj">
+               formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj">
         -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
     </add-flags>
 
@@ -135,7 +139,7 @@
 
     <add-formats files="wx.bkl">wx24dsp</add-formats>
     <add-flags formats="wx24dsp">
-        -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
+        -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWidgets.dsp
     </add-flags>
     
     <add-formats files="wx.bkl">rpmspec</add-formats>
@@ -143,7 +147,7 @@
 
     <!-- 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">
@@ -153,6 +157,9 @@
     <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>
@@ -174,6 +181,9 @@
     <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>
@@ -189,6 +199,9 @@
     <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>
@@ -204,6 +217,9 @@
     <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>
@@ -219,6 +235,9 @@
     <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>