made wxApp::argv an object convertible to either char** or wchar_t** for better compa...

[wxWidgets.git] / build / bakefiles / config.bkl

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index e1d8ccf6fcaadd5536ddb5dbbcc61e06e8cd0cae..94af34ba27fceaf8a18ab4ea6640a43d2ca8dabc 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -5,6 +5,29 @@
 
     <set var="BUILDING_LIB" overwrite="0">0</set>
 
 
     <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>
     <option name="SHARED">
         <values>0,1</values>
         <values-description>,DLL</values-description>


@@ -26,7 +49,7 @@
     <option name="UNICODE">
         <values>0,1</values>
         <values-description>,Unicode</values-description>
     <option name="UNICODE">
         <values>0,1</values>
         <values-description>,Unicode</values-description>

-        <default-value>0</default-value>
+        <default-value>1</default-value>

         <description>
             Compile Unicode build of wxWidgets?
         </description>
         <description>
             Compile Unicode build of wxWidgets?
         </description>


@@ -54,9 +77,36 @@
         </description>
     </option>
 
         </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','msvs2005prj']">1</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">default</if>
+    </set>
+    -->
+    <set var="DEBUG_INFO_DEFAULT">default</set>
+

     <option name="DEBUG_INFO">
         <values>0,1,default</values>
     <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
         <description>
 Should debugging info be included in the executables? The default value
 "default" means that debug info will be included if BUILD=debug


@@ -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)?
             <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>
             </description>
         </option>
     </if>


@@ -131,6 +181,14 @@ Acts according to DEBUG_INFO by default.
         </description>
     </option>
 
         </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>
     <option name="USE_XRC">
         <values>0,1</values>
         <default-value>1</default-value>


@@ -139,25 +197,46 @@ Acts according to DEBUG_INFO by default.
         </description>
     </option>
 
         </description>
     </option>
 

-    <option name="USE_OPENGL">
+    <option name="USE_AUI">

         <values>0,1</values>
         <values>0,1</values>

-        <default-value>0</default-value>
+        <default-value>1</default-value>

         <description>
         <description>

-            Build OpenGL canvas library (USE_GUI must be 1)?
+            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>
 
         </description>
     </option>
 

-    <option name="USE_ODBC">
+    <option name="USE_STC">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Build wxStyledTextCtrl library (USE_GUI must be 1)?
+        </description>
+    </option>
+
+    <option name="USE_OPENGL">

         <values>0,1</values>
         <default-value>0</default-value>
         <description>
         <values>0,1</values>
         <default-value>0</default-value>
         <description>

-            Build ODBC database classes (USE_GUI must be 1)?
+            Build OpenGL canvas library (USE_GUI must be 1)?

         </description>
     </option>
 
         </description>
     </option>
 

+    <!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
+    <set var="USE_QA_DEFAULT">
+        <if cond="FORMAT in ['msvc','msvc6prj','msvs2005prj']">1</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj','msvs2005prj']">0</if>
+    </set>

     <option name="USE_QA">
         <values>0,1</values>
     <option name="USE_QA">
         <values>0,1</values>

-        <default-value>0</default-value>
+        <default-value>$(USE_QA_DEFAULT)</default-value>

         <description>
             Build quality assurance classes library (USE_GUI must be 1)?
         </description>
         <description>
             Build quality assurance classes library (USE_GUI must be 1)?
         </description>


@@ -187,6 +266,16 @@ Acts according to DEBUG_INFO by default.
         </description>
     </option>
 
         </description>
     </option>
 

+    <if cond="FORMAT!='autoconf'">
+        <option name="USE_GDIPLUS">
+            <values>0,1</values>
+            <default-value>0</default-value>
+            <description>
+                Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT)
+            </description>
+       </option>
+    </if>
+

     <option name="OFFICIAL_BUILD">
         <values>0,1</values>
         <default-value>0</default-value>
     <option name="OFFICIAL_BUILD">
         <values>0,1</values>
         <default-value>0</default-value>


@@ -250,11 +339,11 @@ to run the tests, include CppUnit library here.
         <option name="EXTRALIBS"/>
         <option name="EXTRALIBS_XML"/>
         <option name="EXTRALIBS_HTML"/>
         <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="EXTRALIBS_GNOMEPRINT"/>
         <option name="EXTRALIBS_GUI"/>
         <option name="EXTRALIBS_OPENGL"/>
         <option name="EXTRALIBS_SDL"/>
         <option name="EXTRALIBS_GNOMEPRINT"/>

+        <option name="CXXWARNINGS"/>

         <option name="HOST_SUFFIX"/>
         <option name="SAMPLES_RPATH_FLAG"/>
         <option name="SAMPLES_RPATH_POSTLINK"/>
         <option name="HOST_SUFFIX"/>
         <option name="SAMPLES_RPATH_FLAG"/>
         <option name="SAMPLES_RPATH_POSTLINK"/>


@@ -266,11 +355,13 @@ to run the tests, include CppUnit library here.
         <option name="WITH_PLUGIN_SDL">
             <values>0,1</values>
         </option>
         <option name="WITH_PLUGIN_SDL">
             <values>0,1</values>
         </option>

+
+        <option name="wx_top_builddir"/>

     </if>
 
 
     <!-- ================================================================== -->
     </if>
 
 
     <!-- ================================================================== -->

-    <!--                         windows compilers                          -->
+    <!--                     windows/dos/os2 compilers                      -->

     <!-- ================================================================== -->
 
     <if cond="FORMAT!='autoconf'">
     <!-- ================================================================== -->
 
     <if cond="FORMAT!='autoconf'">


@@ -287,8 +378,10 @@ it if SHARED=1 unless you know what you are doing.
         <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
 
         <set var="TOOLKIT" overwrite="0">
         <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'">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"/>
         </set>
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
         <set var="TOOLKIT_VERSION"/>


@@ -297,10 +390,9 @@ it if SHARED=1 unless you know what you are doing.
         <set var="EXTRALIBS"/>
         <set var="EXTRALIBS_XML"/>
         <set var="EXTRALIBS_HTML"/>
         <set var="EXTRALIBS"/>
         <set var="EXTRALIBS_XML"/>
         <set var="EXTRALIBS_HTML"/>

-        <set var="EXTRALIBS_ODBC"/>

         <set var="EXTRALIBS_GUI"/>
         <set var="EXTRALIBS_OPENGL">
         <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>
             <if cond="COMPILER in ['vc','evc']">opengl32.lib glu32.lib</if>
             <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
         </set>


@@ -332,12 +424,6 @@ Set the version of your Mingw installation here.
         <set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
     </if>
 
         <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                  -->
 
     <!-- ================================================================== -->
     <!--            Project files - hardcode some defaults                  -->


@@ -346,35 +432,26 @@ 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>
     <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_STC">1</set>

         <set var="USE_HTML">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_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="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>
+        <if cond="FORMAT!='autoconf'"><set var="USE_GDIPLUS">0</set></if>
+        <set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>

         <set var="DEBUG_FLAG">default</set>
         <set var="MSLU">0</set>
     </if>
 
 
         <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'">
     <!-- DigitalMars make is braindead, it doesn't have conditional
          processing: -->
     <if cond="FORMAT=='dmars'">


@@ -382,7 +459,7 @@ Set the version of your Mingw installation here.
         <set var="BUILD">debug</set>
         <set var="SHARED">0</set>
         <set var="WXUNIV">0</set>
         <set var="BUILD">debug</set>
         <set var="SHARED">0</set>
         <set var="WXUNIV">0</set>

-        <set var="UNICODE">0</set>
+        <set var="UNICODE">1</set>

         <!-- Free version does not distribute OpenGL,
              in commercial distribution better use dmars_smake format -->
         <set var="USE_OPENGL">0</set>
         <!-- Free version does not distribute OpenGL,
              in commercial distribution better use dmars_smake format -->
         <set var="USE_OPENGL">0</set>


@@ -392,9 +469,19 @@ Set the version of your Mingw installation here.
     <if cond="FORMAT=='msevc4prj'">
         <set var="WXUNIV">0</set>
         <set var="UNICODE">1</set>
     <if cond="FORMAT=='msevc4prj'">
         <set var="WXUNIV">0</set>
         <set var="UNICODE">1</set>

-       <!-- Uploading debug reports from PDAs seems impractical -->
+        <!-- Uploading debug reports from PDAs seems impractical -->

         <set var="USE_QA">0</set>
         <set var="MONOLITHIC">1</set> <!-- sic! -->
         <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>
     </if>
 
 </makefile>