X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cff5df9f18b1e9010baa3f4048cc48b000e8e4ac..cecc483e14c2fa839830052ab870de6c53ef3095:/build/bakefiles/config.bkl

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index c7bcbd6d4d..94314e821e 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -37,7 +37,23 @@
             Build GUI libraries?
         </description>
     </option>
-
+    
+    <option name="USE_HTML">
+        <values>0 1</values>
+        <default-value>1</default-value>
+        <description>
+            Build wxHTML library (USE_GUI must be 1)?
+        </description>
+    </option>
+    
+    <option name="USE_OPENGL">
+        <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>
         <default-value>0</default-value>
@@ -46,7 +62,6 @@
         </description>
     </option>
 
-
     <option name="OFFICIAL_BUILD">
         <values>0 1</values>
         <default-value>0</default-value>
@@ -81,9 +96,16 @@
         <option name="TOOLKIT"/>
         <option name="TOOLKIT_LOWERCASE"/>
         <option name="TOOLKIT_VERSION"/>
+        <option name="TOOLCHAIN_NAME"/>
         <option name="EXTRALIBS"/>
+        <option name="EXTRALIBS_XML"/>
+        <option name="EXTRALIBS_GUI"/>
+        <option name="EXTRALIBS_OPENGL"/>
         <option name="SAMPLES_RPATH_FLAG"/>
+        <option name="HOST_SUFFIX"/>
+        
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
+        <set var="RUNTIME_LIBS">dynamic</set>
     </if>
 
     
@@ -92,13 +114,27 @@
     <!-- ================================================================== -->
 
     <if cond="FORMAT!='autoconf'">
+        <option name="RUNTIME_LIBS">
+            <values>dynamic static</values>
+            <default-value>dynamic</default-value>
+            <description>
+                Version of C runtime library to use. You can change this to
+                static if SHARED=0, but it is highly recommended to not do
+                it if SHARED=1 unless you know what you are doing.
+            </description>
+        </option>
+        
         <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
 
         <set var="TOOLKIT">MSW</set>
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
         <set var="TOOLKIT_VERSION"/>
         <set var="SAMPLES_RPATH_FLAG"/>
-        <option name="EXTRALIBS"/>
+        <set var="HOST_SUFFIX"/>
+        <set var="EXTRALIBS"/>
+        <set var="EXTRALIBS_XML"/>
+        <set var="EXTRALIBS_GUI"/>
+        <set var="EXTRACFLAGS"/>
 
         <set var="SRCDIR">
             <if cond="BUILDING_LIB=='1'">..</if>
@@ -106,5 +142,21 @@
         </set>
         <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
     </if>
-
+    
+    <if cond="FORMAT=='mingw'">
+        <option name="GCC_VERSION">
+            <values>3 2.95</values>
+            <default-value>3</default-value>
+            <description>
+                Set the version of your Mingw installation here.
+                "3" ...... this is for Mingw 2.0 or newer that cames with gcc3
+                "2.95" ... for Mingw 1.1 or any of the older versions
+            </description>
+        </option>
+        <set var="GCCFLAGS">
+            <if cond="GCC_VERSION=='2.95'">-fvtable-thunks</if>
+        </set>
+        <set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
+    </if>
+    
 </makefile>