X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22cef5668d65bd564b373609ceeda64ac5ea95db..d40f860378b778081f076e192817ab4e6a7d4e13:/build/bakefiles/config.bkl

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index b41f923ad6..930eb771c6 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -86,16 +86,34 @@ Acts according to DEBUG_INFO by default.
     <if cond="FORMAT!='msvc'">
         <set var="DEBUG_RUNTIME_LIBS">default</set>
     </if>
-    
+
+    <set var="MONOLITHIC_DEFAULT">
+        <if cond="FORMAT=='watcom'">1</if>
+        <if cond="FORMAT!='watcom'">0</if>
+    </set>
     <option name="MONOLITHIC">
         <values>0,1</values>
         <values-description>Multilib,Monolithic</values-description>
-        <default-value>0</default-value>
+        <default-value>$(MONOLITHIC_DEFAULT)</default-value>
         <description>
             Multiple libraries or single huge monolithic one?
         </description>
     </option>
     
+    <if cond="FORMAT=='autoconf'"> <!-- FIXME - temporary -->
+        <option name="USE_PLUGINS">
+            <values>0,1</values>
+            <default-value>1</default-value>
+            <description>
+                Build parts of the library as dynamically loadable plugins
+                (only supported in multilib build)?
+            </description>
+        </option>
+    </if>
+    <if cond="FORMAT!='autoconf'">
+        <set var="USE_PLUGINS">0</set> <!-- FIXME - temporary -->
+    </if>
+    
     <option name="USE_GUI">
         <values>0,1</values>
         <values-description>Base,GUI</values-description>
@@ -129,6 +147,14 @@ Acts according to DEBUG_INFO by default.
         </description>
     </option>
     
+    <option name="USE_EXCEPTIONS">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Enable exceptions in compiled code.
+        </description>
+    </option>
+    
     <option name="OFFICIAL_BUILD">
         <values>0,1</values>
         <default-value>0</default-value>
@@ -151,8 +177,8 @@ where object files are stored as well as the location of
 compiled .lib files and setup.h under the lib/ toplevel directory.
         </description>
     </option>
-
-
+    
+    
     <!-- ================================================================== -->
     <!--                             Autoconf                               -->
     <!-- ================================================================== -->
@@ -165,9 +191,11 @@ compiled .lib files and setup.h under the lib/ toplevel directory.
         <option name="TOOLCHAIN_NAME"/>
         <option name="EXTRALIBS"/>
         <option name="EXTRALIBS_XML"/>
+        <option name="EXTRALIBS_HTML"/>
         <option name="EXTRALIBS_ODBC"/>
         <option name="EXTRALIBS_GUI"/>
         <option name="EXTRALIBS_OPENGL"/>
+        <option name="EXTRALIBS_SDL"/>
         <option name="HOST_SUFFIX"/>
         <option name="SAMPLES_RPATH_FLAG"/>
         <option name="SAMPLES_RPATH_POSTLINK"/>
@@ -175,11 +203,15 @@ compiled .lib files and setup.h under the lib/ toplevel directory.
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
+    
+        <option name="WITH_PLUGIN_SDL">
+            <values>0,1</values>
+        </option>
     </if>
 
     
     <!-- ================================================================== -->
-    <!--                         Windows compilers                          -->
+    <!--                         windows compilers                          -->
     <!-- ================================================================== -->
 
     <if cond="FORMAT!='autoconf'">
@@ -202,12 +234,17 @@ it if SHARED=1 unless you know what you are doing.
         <set var="EXTRACFLAGS"/>
         <set var="EXTRALIBS"/>
         <set var="EXTRALIBS_XML"/>
+        <set var="EXTRALIBS_HTML"/>
         <set var="EXTRALIBS_ODBC"/>
         <set var="EXTRALIBS_GUI"/>
         <set var="EXTRALIBS_OPENGL">
             <if cond="COMPILER=='wat'">opengl32.lib glu32.lib</if>
+            <if cond="COMPILER=='vc'">opengl32.lib glu32.lib</if>
             <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
         </set>
+        <set var="EXTRALIBS_SDL"/>
+
+        <set var="WITH_PLUGIN_SDL">0</set>
 
         <set var="SRCDIR">
             <if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
@@ -232,7 +269,12 @@ Set the version of your Mingw installation here.
         <set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
     </if>
 
-    
+    <if cond="FORMAT=='cbuilderx'">
+        <set var="EXTRACFLAGS">
+            <if cond="COMPILER=='gcc'">-DHAVE_W32API_H</if>
+        </set>
+    </if>
+
 
     <!-- ================================================================== -->
     <!--            Project files - hardcode some defaults                  -->
@@ -246,9 +288,34 @@ Set the version of your Mingw installation here.
         <set var="USE_ODBC">1</set>
         <set var="MONOLITHIC">0</set>
         <set var="USE_GUI">1</set>
+        <set var="USE_EXCEPTIONS">1</set>
         <set var="DEBUG_INFO">default</set>
         <set var="DEBUG_FLAG">default</set>
         <set var="MSLU">0</set>
     </if>
 
+
+    <!-- FIXME:
+         C++BuilderX supports only wxMSW, monolithic (sic!) static build
+         and the project can't be put into build/msw and store objects in
+         build/msw/something. This *must* be fixed! -->
+    <if cond="FORMAT=='cbuilderx'">
+        <set var="WXUNIV">0</set>
+        <set var="MONOLITHIC">1</set>
+        <set var="SRCDIR">.</set>
+        <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
+        <set var="SHARED">0</set>
+    </if>
+
+
+    <!-- DigitalMars make is braindead, it doesn't have conditional
+         processing: -->
+    <if cond="FORMAT=='dmars'">
+        <set var="RUNTIME_LIBS">static</set>
+        <set var="BUILD">debug</set>
+        <set var="SHARED">0</set>
+        <set var="WXUNIV">0</set>
+        <set var="UNICODE">0</set>
+    </if>
+
 </makefile>