X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f6e1dac129164733338529ee65453b12573596e..af9801172360751bb28854b6bdb4d353e77182ef:/build/bakefiles/config.bkl

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index d899bbcc17..f6fe38d2de 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -5,17 +5,57 @@
     
     <set var="BUILDING_LIB" overwrite="0">0</set>
 
+    <option name="SHARED">
+        <values>0,1</values>
+        <values-description>,DLL</values-description>
+        <default-value>0</default-value>
+        <description>
+            What type of library to build?
+        </description>
+    </option>
+    
+    <option name="WXUNIV">
+        <values>0,1</values>
+        <values-description>,Universal</values-description>
+        <default-value>0</default-value>
+        <description>
+            Build wxUniversal instead of native port?
+        </description>
+    </option>
+
+    <option name="UNICODE">
+        <values>0,1</values>
+        <values-description>,Unicode</values-description>
+        <default-value>0</default-value>        
+        <description>
+            Compile Unicode build of wxWindows?
+        </description>
+    </option>
+
+    <if cond="FORMAT!='autoconf' and FORMAT!='watcom'">
+        <option name="MSLU">
+            <values>0,1</values>
+            <default-value>0</default-value>        
+            <description>
+                Use MSLU library when building Unicode version.
+            </description>
+        </option>
+    </if>
+    <if cond="FORMAT=='autoconf' or FORMAT=='watcom'">
+        <set var="MSLU">0</set>
+    </if>
+
     <option name="BUILD">
-        <values>debug release</values>
-        <values-description>Debug Release</values-description>
-        <default-value>release</default-value>
+        <values>debug,release</values>
+        <values-description>Debug,Release</values-description>
+        <default-value>debug</default-value>
         <description>
             Type of compiled binaries
         </description>
     </option>
     
     <option name="DEBUG_INFO">
-        <values>0 1 default</values>
+        <values>0,1,default</values>
         <default-value>default</default-value>
         <description>
 Should debugging info be included in the executables? The default value
@@ -25,7 +65,7 @@ and not included if BUILD=release.
     </option>
     
     <option name="DEBUG_FLAG">
-        <values>0 1 default</values>
+        <values>0,1,default</values>
         <default-value>default</default-value>
         <description>
 Should __WXDEBUG__ be defined? The default value "default" means that it will
@@ -35,7 +75,7 @@ be defined if BUILD=debug and not defined if BUILD=release.
 
     <if cond="FORMAT=='msvc'">
         <option name="DEBUG_RUNTIME_LIBS">
-            <values>0 1 default</values>
+            <values>0,1,default</values>
             <default-value>default</default-value>
             <description>
 Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
@@ -46,37 +86,19 @@ Acts according to DEBUG_INFO by default.
     <if cond="FORMAT!='msvc'">
         <set var="DEBUG_RUNTIME_LIBS">default</set>
     </if>
-
-    <option name="UNICODE">
-        <values>0 1</values>
-        <values-description>Ansi Unicode</values-description>
-        <default-value>0</default-value>        
-        <description>
-            Compile Unicode build of wxWindows?
-        </description>
-    </option>
-
-    <option name="SHARED">
-        <values>0 1</values>
-        <values-description>Static DLL</values-description>
-        <default-value>1</default-value>
-        <description>
-            What type of library to build?
-        </description>
-    </option>
     
     <option name="MONOLITHIC">
-        <values>0 1</values>
-        <values-description>Multilib Monolithic</values-description>
-        <default-value>1</default-value>
+        <values>0,1</values>
+        <values-description>Multilib,Monolithic</values-description>
+        <default-value>0</default-value>
         <description>
             Multiple libraries or single huge monolithic one?
         </description>
     </option>
     
     <option name="USE_GUI">
-        <values>0 1</values>
-        <values-description>Base GUI</values-description>
+        <values>0,1</values>
+        <values-description>Base,GUI</values-description>
         <default-value>1</default-value>
         <description>
             Build GUI libraries?
@@ -84,7 +106,7 @@ Acts according to DEBUG_INFO by default.
     </option>
     
     <option name="USE_HTML">
-        <values>0 1</values>
+        <values>0,1</values>
         <default-value>1</default-value>
         <description>
             Build wxHTML library (USE_GUI must be 1)?
@@ -92,24 +114,31 @@ Acts according to DEBUG_INFO by default.
     </option>
     
     <option name="USE_OPENGL">
-        <values>0 1</values>
+        <values>0,1</values>
         <default-value>0</default-value>
         <description>
             Build OpenGL canvas library (USE_GUI must be 1)?
         </description>
     </option>
     
-    <option name="WXUNIV">
-        <values>0 1</values>
-        <values-description>Native wxUniv</values-description>
+    <option name="USE_ODBC">
+        <values>0,1</values>
         <default-value>0</default-value>
         <description>
-            Build wxUniversal instead of native port?
+            Build ODBC database classes (USE_GUI must be 1)?
         </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>
+        <values>0,1</values>
         <default-value>0</default-value>
         <description>
             Is this official build by wxWindows developers?
@@ -144,13 +173,16 @@ 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_ODBC"/>
         <option name="EXTRALIBS_GUI"/>
         <option name="EXTRALIBS_OPENGL"/>
-        <option name="SAMPLES_RPATH_FLAG"/>
         <option name="HOST_SUFFIX"/>
+        <option name="SAMPLES_RPATH_FLAG"/>
+        <option name="SAMPLES_RPATH_POSTLINK"/>
         
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
         <set var="RUNTIME_LIBS">dynamic</set>
+        <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
     </if>
 
     
@@ -160,7 +192,7 @@ compiled .lib files and setup.h under the lib/ toplevel directory.
 
     <if cond="FORMAT!='autoconf'">
         <option name="RUNTIME_LIBS">
-            <values>dynamic static</values>
+            <values>dynamic,static</values>
             <default-value>dynamic</default-value>
             <description>
 Version of C runtime library to use. You can change this to
@@ -174,15 +206,20 @@ it if SHARED=1 unless you know what you are doing.
         <set var="TOOLKIT">MSW</set>
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
         <set var="TOOLKIT_VERSION"/>
-        <set var="SAMPLES_RPATH_FLAG"/>
         <set var="HOST_SUFFIX"/>
+        <set var="EXTRACFLAGS"/>
         <set var="EXTRALIBS"/>
         <set var="EXTRALIBS_XML"/>
+        <set var="EXTRALIBS_ODBC"/>
         <set var="EXTRALIBS_GUI"/>
-        <set var="EXTRACFLAGS"/>
+        <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="SRCDIR">
-            <if cond="BUILDING_LIB=='1'">..</if>
+            <if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
             <if cond="BUILDING_LIB=='0'">.</if>
         </set>
         <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
@@ -190,7 +227,7 @@ it if SHARED=1 unless you know what you are doing.
     
     <if cond="FORMAT=='mingw'">
         <option name="GCC_VERSION">
-            <values>3 2.95</values>
+            <values>3,2.95</values>
             <default-value>3</default-value>
             <description>
 Set the version of your Mingw installation here.
@@ -203,5 +240,25 @@ Set the version of your Mingw installation here.
         </set>
         <set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
     </if>
+
     
+
+    <!-- ================================================================== -->
+    <!--            Project files - hardcode some defaults                  -->
+    <!-- ================================================================== -->
+
+    <if cond="FORMAT_SUPPORTS_CONDITIONS=='0'">
+        <set var="RUNTIME_LIBS">dynamic</set>
+        <set var="OFFICIAL_BUILD">0</set>
+        <set var="USE_HTML">1</set>
+        <set var="USE_OPENGL">1</set>
+        <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>
+
 </makefile>