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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index dd44817798..13989771be 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -2,9 +2,32 @@
 <!-- $Id$ -->
 
 <makefile>
-    
+
     <set var="BUILDING_LIB" overwrite="0">0</set>
 
+    <set var="CPP_DEFAULT_VALUE">
+        <if cond="FORMAT=='borland'">
+            cpp32 -Sr -oCON
+        </if>
+        <if cond="FORMAT=='mingw'">
+            $(DOLLAR)(CC) -E
+        </if>
+        <if cond="FORMAT=='msvc'">
+            $(DOLLAR)(CC) /EP /nologo
+        </if>
+        <if cond="FORMAT=='watcom'">
+            $(DOLLAR)(CC) -p
+        </if>
+    </set>
+    <option name="CPP">
+        <default-value>
+            $(CPP_DEFAULT_VALUE)
+        </default-value>
+        <description>
+            The C preprocessor
+        </description>
+    </option>
+
     <option name="SHARED">
         <values>0,1</values>
         <values-description>,DLL</values-description>
@@ -13,7 +36,7 @@
             What type of library to build?
         </description>
     </option>
-    
+
     <option name="WXUNIV">
         <values>0,1</values>
         <values-description>,Universal</values-description>
@@ -26,7 +49,7 @@
     <option name="UNICODE">
         <values>0,1</values>
         <values-description>,Unicode</values-description>
-        <default-value>0</default-value>        
+        <default-value>0</default-value>
         <description>
             Compile Unicode build of wxWidgets?
         </description>
@@ -35,7 +58,7 @@
     <if cond="FORMAT!='autoconf' and FORMAT!='watcom'">
         <option name="MSLU">
             <values>0,1</values>
-            <default-value>0</default-value>        
+            <default-value>0</default-value>
             <description>
                 Use MSLU library when building Unicode version.
             </description>
@@ -53,17 +76,44 @@
             Type of compiled binaries
         </description>
     </option>
-    
+
+    <if cond="FORMAT=='msvc'">
+        <option name="TARGET_CPU">
+            <default-value>$(DOLLAR)(CPU)</default-value>
+            <description>
+The target processor architecture must be specified when it is not X86.
+This does not affect the compiler output, so you still need to make sure
+your environment is set up appropriately with the correct compiler in the
+PATH. Rather it affects some options passed to some of the common build
+utilities such as the resource compiler and the linker.
+
+Accepted values: AMD64, IA64.
+            </description>
+        </option>
+    </if>
+    <if cond="FORMAT!='msvc'">
+        <set var="TARGET_CPU"/>
+    </if>
+
+    <!-- FIXME: restore this once bakefile is fixed to not use
+                /Gm /GZ (incompatible with /O2) w/ debug-info -->
+    <set var="DEBUG_INFO_DEFAULT">
+        <if cond="FORMAT in ['msvc','msvc6prj','msevc4prj']">1</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj']">default</if>
+    </set>
+    -->
+    <set var="DEBUG_INFO_DEFAULT">default</set>
+
     <option name="DEBUG_INFO">
         <values>0,1,default</values>
-        <default-value>default</default-value>
+        <default-value>$(DEBUG_INFO_DEFAULT)</default-value>
         <description>
 Should debugging info be included in the executables? The default value
 "default" means that debug info will be included if BUILD=debug
 and not included if BUILD=release.
         </description>
     </option>
-    
+
     <option name="DEBUG_FLAG">
         <values>0,1,default</values>
         <default-value>default</default-value>
@@ -79,7 +129,7 @@ be defined if BUILD=debug and not defined if BUILD=release.
             <default-value>default</default-value>
             <description>
 Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
-Acts according to DEBUG_INFO by default.
+Acts according to BUILD by default.
             </description>
         </option>
     </if>
@@ -99,7 +149,7 @@ Acts according to DEBUG_INFO by default.
             Multiple libraries or single huge monolithic one?
         </description>
     </option>
-    
+
     <if cond="FORMAT=='autoconf'"> <!-- FIXME - temporary -->
         <option name="USE_PLUGINS">
             <values>0,1</values>
@@ -113,7 +163,7 @@ Acts according to DEBUG_INFO by default.
     <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>
@@ -122,7 +172,7 @@ Acts according to DEBUG_INFO by default.
             Build GUI libraries?
         </description>
     </option>
-    
+
     <option name="USE_HTML">
         <values>0,1</values>
         <default-value>1</default-value>
@@ -130,7 +180,15 @@ Acts according to DEBUG_INFO by default.
             Build wxHTML library (USE_GUI must be 1)?
         </description>
     </option>
-    
+
+    <option name="USE_MEDIA">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Build multimedia library (USE_GUI must be 1)?
+        </description>
+    </option>
+
     <option name="USE_XRC">
         <values>0,1</values>
         <default-value>1</default-value>
@@ -138,7 +196,23 @@ Acts according to DEBUG_INFO by default.
             Build wxXRC library (USE_GUI must be 1)?
         </description>
     </option>
-    
+
+    <option name="USE_AUI">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Build wxAUI library (USE_GUI must be 1)?
+        </description>
+    </option>
+
+    <option name="USE_RICHTEXT">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Build wxRichTextCtrl library (USE_GUI must be 1)?
+        </description>
+    </option>
+
     <option name="USE_OPENGL">
         <values>0,1</values>
         <default-value>0</default-value>
@@ -146,7 +220,7 @@ Acts according to DEBUG_INFO by default.
             Build OpenGL canvas library (USE_GUI must be 1)?
         </description>
     </option>
-    
+
     <option name="USE_ODBC">
         <values>0,1</values>
         <default-value>0</default-value>
@@ -154,7 +228,20 @@ Acts according to DEBUG_INFO by default.
             Build ODBC database classes (USE_GUI must be 1)?
         </description>
     </option>
-    
+
+    <!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
+    <set var="USE_QA_DEFAULT">
+        <if cond="FORMAT in ['msvc','msvc6prj']">1</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj']">0</if>
+    </set>
+    <option name="USE_QA">
+        <values>0,1</values>
+        <default-value>$(USE_QA_DEFAULT)</default-value>
+        <description>
+            Build quality assurance classes library (USE_GUI must be 1)?
+        </description>
+    </option>
+
     <option name="USE_EXCEPTIONS">
         <values>0,1</values>
         <default-value>1</default-value>
@@ -162,7 +249,15 @@ Acts according to DEBUG_INFO by default.
             Enable exceptions in compiled code.
         </description>
     </option>
-    
+
+    <option name="USE_RTTI">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Enable run-time type information (RTTI) in compiled code.
+        </description>
+    </option>
+
     <option name="USE_THREADS">
         <values>0,1</values>
         <default-value>1</default-value>
@@ -170,7 +265,7 @@ Acts according to DEBUG_INFO by default.
             Enable threading in compiled code.
         </description>
     </option>
-    
+
     <option name="OFFICIAL_BUILD">
         <values>0,1</values>
         <default-value>0</default-value>
@@ -210,7 +305,7 @@ Compiler flags needed to compile test suite in tests directory. If you want
 to run the tests, set it so that the compiler can find CppUnit headers.
         </description>
     </option>
-    
+
     <option name="CPPUNIT_LIBS">
         <default-value></default-value>
         <description>
@@ -218,13 +313,13 @@ Linker flags needed to link test suite in tests directory. If you want
 to run the tests, include CppUnit library here.
         </description>
     </option>
-    
-    
+
+
     <!-- ================================================================== -->
     <!--                             Autoconf                               -->
     <!-- ================================================================== -->
-    
-    <if cond="FORMAT=='autoconf'"> 
+
+    <if cond="FORMAT=='autoconf'">
         <option name="DEREZ"/>
         <option name="TOOLKIT"/>
         <option name="TOOLKIT_LOWERCASE"/>
@@ -242,19 +337,19 @@ to run the tests, include CppUnit library here.
         <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 -->
-    
+
         <option name="WITH_PLUGIN_SDL">
             <values>0,1</values>
         </option>
     </if>
 
-    
+
     <!-- ================================================================== -->
-    <!--                         windows compilers                          -->
+    <!--                     windows/dos/os2 compilers                      -->
     <!-- ================================================================== -->
 
     <if cond="FORMAT!='autoconf'">
@@ -267,12 +362,14 @@ 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" overwrite="0">
-            <if cond="FORMAT!='msevc4prj'">MSW</if>
             <if cond="FORMAT=='msevc4prj'">WINCE</if>
+            <if cond="FORMAT!='msevc4prj' and PLATFORM_WIN32=='1'">MSW</if>
+            <if cond="PLATFORM_MSDOS=='1'">MGL</if>
+            <if cond="PLATFORM_OS2=='1'">PM</if>
         </set>
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
         <set var="TOOLKIT_VERSION"/>
@@ -284,7 +381,7 @@ it if SHARED=1 unless you know what you are doing.
         <set var="EXTRALIBS_ODBC"/>
         <set var="EXTRALIBS_GUI"/>
         <set var="EXTRALIBS_OPENGL">
-            <if cond="COMPILER=='wat'">opengl32.lib glu32.lib</if>
+            <if cond="COMPILER=='wat' and TOOLKIT=='MSW'">opengl32.lib glu32.lib</if>
             <if cond="COMPILER in ['vc','evc']">opengl32.lib glu32.lib</if>
             <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
         </set>
@@ -299,7 +396,7 @@ it if SHARED=1 unless you know what you are doing.
         </set>
         <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
     </if>
-    
+
     <if cond="FORMAT=='mingw'">
         <option name="GCC_VERSION">
             <values>3,2.95</values>
@@ -330,15 +427,20 @@ Set the version of your Mingw installation here.
     <if cond="FORMAT_SUPPORTS_CONDITIONS=='0'">
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="OFFICIAL_BUILD">0</set>
+        <set var="USE_AUI">1</set>
+        <set var="USE_RICHTEXT">1</set>
         <set var="USE_HTML">1</set>
+        <set var="USE_MEDIA">1</set>
         <set var="USE_XRC">1</set>
         <set var="USE_OPENGL">1</set>
         <set var="USE_ODBC">1</set>
+        <set var="USE_QA">1</set>
         <set var="MONOLITHIC">0</set>
         <set var="USE_GUI">1</set>
         <set var="USE_EXCEPTIONS">1</set>
+        <set var="USE_RTTI">1</set>
         <set var="USE_THREADS">1</set>
-        <set var="DEBUG_INFO">default</set>
+        <set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
         <set var="DEBUG_FLAG">default</set>
         <set var="MSLU">0</set>
     </if>
@@ -374,7 +476,19 @@ Set the version of your Mingw installation here.
     <if cond="FORMAT=='msevc4prj'">
         <set var="WXUNIV">0</set>
         <set var="UNICODE">1</set>
+        <!-- Uploading debug reports from PDAs seems impractical -->
+        <set var="USE_QA">0</set>
         <set var="MONOLITHIC">1</set> <!-- sic! -->
+        <!-- RTTI and exceptions need separate cccrtti.lib with eVC4 -->
+        <set var="USE_RTTI">0</set>
+        <set var="USE_EXCEPTIONS">0</set>
+    </if>
+
+    <!-- Need for wxUniv within wxMGL: -->
+    <if cond="FORMAT!='autoconf' and TOOLKIT=='MGL'">
+        <set var="WXUNIV">1</set>
+        <set var="USE_THREADS">0</set>
+        <set var="RUNTIME_LIBS">static</set>
     </if>
 
 </makefile>