Tagged 2.8.12 release

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_8_12@67341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

.cvsignore

@@ -0,0 +1,12 @@
+.gdb_history
+config.cache
+configarg.cache
+config.status
+wx-config
+config.log
+stamp-h.in
+Makefile
+setup.h
+*tags
+.DS_Store
+autom4te.cache

BuildCVS.txt

@@ -0,0 +1,262 @@
+------------------------------------------------------------------------
+                How to build the sources from CVS
+------------------------------------------------------------------------
+
+Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac
+etc. alongside these instructions.
+
+I) Windows using plain makefiles
+----------------------------------------
+
+a) If using Microsoft Visual C++ 5.0 or 6.0
+
+Ensure that the command-line compiler and tools (including
+nmake) are installed and ready to run.  Depending on your
+installation there may be a batch file (commonly named VCVARS32.BAT)
+that needs to be run to set correct environment variables and PATH entries.
+
+Continue with item c) below.
+
+
+b) If using the MinGW or Cygwin compilers
+
+You can get MinGW from  http://www.mingw.org/
+
+Cygwin is available at  http://www.cygwin.com/
+
+If you are using Cygwin or MinGW together with the MSYS environment, you
+can build the library using configure (see "Unix ports" and
+"Windows using configure" below). You can also
+build wxWidgets without configure using native makefile, but only with
+MinGW. Using Cygwin together with Windows makefile is no longer supported.
+
+If building with MinGW without configure:
+
+-> Set your path so that it includes the directory
+   where your compiler and tools reside
+
+-> Make sure you have GNU Make installed. It must be Windows native version.
+   Download it from http://www.mingw.org, the executable will be called
+   mingw32-make.exe.
+
+-> Modern version of MinGW is required; preferably MinGW 2.0 (with gcc3),
+   but MinGW with gcc-2.95.3 will suffice. If you are using 2.95, you will
+   have to change variable GCC_VERSION in config.gcc (see msw/install.txt
+   for details).
+
+If using configure, Unix instructions apply.
+
+
+c) Build instructions
+
+Assumming that you installed the wxWidgets sources
+into c:\wxWidgets:
+
+-> Copy c:\wxWidgets\include\wx\msw\setup0.h
+   to   c:\wxWidgets\include\wx\msw\setup.h
+-> Edit c:\wxWidgets\include\wx\msw\setup.h to choose
+   the features you would like to compile wxWidgets with[out].
+
+   and std iostreams are disabled with
+   #define wxUSE_STD_IOSTREAM   0
+ 
+-> type: cd c:\wxWidgets\build\msw
+-> type: make -f makefile.gcc  (if using GNU tools)
+or type: nmake -f makefile.vc   (if using MS VC++)
+etc.
+
+   See also docs/msw/install.txt for additional compilation options.
+
+d) Borland (including free command line tools)
+   Download tools from http://www.borland.com/downloads/
+   
+   See docs/msw/install.txt for details; in brief:
+
+-> type cd c:\wxWidgets\build\msw
+-> type make -f makefile.bcc
+
+You can customize many things in the build process, detailed description is
+in docs/msw/install.txt.
+
+
+II) Unix ports
+--------------
+
+Building wxGTK or wxMotif completely without configure
+won't ever work, but there is now a new makefile system
+that works without libtool and automake, using only
+configure to create what is needed.
+
+In order to create configure, you need to have the
+GNU autoconf package (version > 2.54) installed
+on your system and type run "autoconf" in the base
+directory (or run the autogen.sh script in the same
+directory, which just calls autoconf). Note that you usually don't
+need to do this because configure is included in CVS.
+
+Set WXWIN environment variable to the base directory such
+as ~/wxWidgets (this is actually not really needed).
+
+-> type: export WXWIN=~/wxWidgets
+-> type: md mybuild
+-> type: cd mybuild
+-> type: ../configure --with-motif
+or type: ../configure --with-gtk
+-> type: make
+-> type: su <type root password>
+-> type: make install
+-> type: ldconfig
+-> type: exit
+
+Call configure with --disable-shared to create a static
+library. Calling "make uninstall" will remove the installed
+library and "make dist" will create a distribution (not
+yet complete).
+
+III) Windows using configure
+----------------------------------------
+
+wxWidgets can be built on Windows using MSYS (see
+http://www.mingw.org/), which is a POSIX build environment
+for Windows. With MSYS you can just ./configure && make (see also VII,
+Unix->Windows cross-compiling using configure).
+
+Of course, you can also build the library using plain makefiles (see
+section I).
+
+IV) Classic MacOS using CodeWarrior (eg MacOS 8.x/9.x)
+----------------------------------------
+
+Refer to the readme.txt and install.txt files in docs/mac to build
+wxWidgets under Classic Mac OS using CodeWarrior.
+
+If you are checking out the CVS sources using cvs under Mac OS X and
+compiling under Classic Mac OS:
+
+- make sure that all text files have a Mac OS type of 'TEXT' otherwise
+  CodeWarrior may ignore them. Checking out the CVS sources using cvs
+  under Mac OS X creates untyped files which can lead to compilation
+  errors under CodeWarrior which are hard to track down.
+
+- convert the xml files to CodeWarrior binary projects using the supplied
+  AppleScript in docs/mac (M5xml2mcp.applescript for CodeWarrior 5.3)
+
+V) MacOS X using configure and the Developer Tools
+----------------------------------------
+
+You need to have the Developer Tools installed. If this is not the case,
+you will need to register at the Apple Developer web site (this is a free
+registration) in order to download the Developer Tools installer.
+
+In order to create configure, you need to have the
+GNU autoconf package (version >= 2.54) installed
+on your system and type run "autoconf" in the base
+directory (or run the autogen.sh script in the same
+directory, which just calls autoconf).
+
+-> type: mkdir macbuild
+-> type: cd macbuild
+-> type: ../configure --with-mac
+or type: ../configure
+-> type: make
+
+VI) OS/2
+----------------------------------------
+No notes.
+
+VII) Unix->Windows cross-compiling using configure
+--------------------------------------------------
+
+First you'll need a cross-compiler; linux glibc binaries of MinGW and
+Cygwin (both based on egcs) can be found at
+ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries,
+based on the latest MinGW release can be found at
+http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
+Otherwise you can compile one yourself.
+
+[ A Note about Cygwin and MinGW: the main difference is that Cygwin
+binaries are always linked against cygwin.dll. This dll encapsulates most
+standard Unix C extensions, which is very handy if you're porting unix
+software to windows. However, wxMSW doesn't need this, so MinGW is
+preferable if you write portable C(++). ]
+
+You might want to build both Unix and Windows binaries in the same source
+tree; to do this make subdirs for each e.g. unix and win32. If you've
+already build wxWidgets in the main dir, do a 'make distclean' there,
+otherwise configure will get confused. (In any case, read the section 'Unix
+using configure' and make sure you're able to build a native wxWidgets
+library; cross-compiling errors can be pretty obscure and you'll want to be
+sure that your configure setup is basically sound.)
+
+To cross compile the windows library, do
+-> cd win32
+(or whatever you called it)
+Now run configure. There are two ways to do this
+-> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw
+where --build= should read whatever platform you're building on. Configure
+will notice that build and host platforms differ, and automatically prepend
+i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
+The other way to run configure is by specifying the names of the binaries
+yourself:
+-> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
+   DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
+   ../configure --host=i586-mingw32 --with-mingw
+
+(all assuming you're using MinGW)
+By default this will compile a DLL, if you want a static library,
+specify --disable-shared.
+
+Type
+-> make
+and wait, wait, wait. Don't leave the room, because the minute you do there
+will be a compile error :-)
+
+NB: if you are using a very old compiler you risk to get quite a few warnings
+    about "ANSI C++ forbids implicit conversion from 'void *'" in all places
+    where va_arg macro is used. This is due to a bug in (some versions of)
+    MinGW headers which may be corrected by upgrading your compier,
+    otherwise you might edit the file
+
+    ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
+
+    (instead of egcs-2.91.57 you may have something different), searching for
+    the lines
+
+/* Define __gnuc_va_list.  */
+
+#ifndef __GNUC_VA_LIST
+#define __GNUC_VA_LIST
+#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
+typedef char *__gnuc_va_list;
+#else
+typedef void *__gnuc_va_list;
+#endif
+#endif
+
+    and adding "|| defined(_WIN32)" to the list of platforms on which
+    __gnuc_va_list is char *.
+
+If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib
+(or just libwx_msw.a if you opted for a static build).
+Now try building the minimal sample:
+
+-> cd samples/minimal
+-> make
+
+and run it with wine, for example (or copy to a Windows box)
+-> wine minimal.exe
+
+If all is well, do an install; from win32
+-> make install
+
+Native and cross-compiled installations can co-exist peacefully
+(as long as their widget sets differ), except for wx-config. You might
+want to rename the cross-compiled one to i586-mingw32-wx-config, or something.
+
+Cross-compiling TODO:
+---------------------
+- resource compiling must be done manually for now (should/can we link the
+default wx resources into libwx_msw.a?) [ No we can't; the linker won't
+link it in... you have to supply an object file ]
+- static executables are HUGE -- there must be room for improvement.
+

BuildSVN.txt

@@ -1,261 +0,0 @@
-------------------------------------------------------------------------
-                How to build the sources from SVN
-------------------------------------------------------------------------
-
-Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac
-etc. alongside these instructions.
-
-I) Windows using plain makefiles
-----------------------------------------
-
-a) If using Microsoft Visual C++ 5.0 or 6.0
-
-Ensure that the command-line compiler and tools (including
-nmake) are installed and ready to run.  Depending on your
-installation there may be a batch file (commonly named VCVARS32.BAT)
-that needs to be run to set correct environment variables and PATH entries.
-
-Continue with item c) below.
-
-
-b) If using the MinGW or Cygwin compilers
-
-You can get MinGW from  http://www.mingw.org/
-
-Cygwin is available at  http://www.cygwin.com/
-
-If you are using Cygwin or MinGW together with the MSYS environment, you
-can build the library using configure (see "Unix ports" and
-"Windows using configure" below). You can also
-build wxWidgets without configure using native makefile, but only with
-MinGW. Using Cygwin together with Windows makefile is no longer supported.
-
-If building with MinGW without configure:
-
--> Set your path so that it includes the directory
-   where your compiler and tools reside
-
--> Make sure you have GNU Make installed. It must be Windows native version.
-   Download it from http://www.mingw.org, the executable will be called
-   mingw32-make.exe.
-
--> Modern version of MinGW is required; preferably MinGW 2.0 (with gcc3),
-   but MinGW with gcc-2.95.3 will suffice. If you are using 2.95, you will
-   have to change variable GCC_VERSION in config.gcc (see msw/install.txt
-   for details).
-
-If using configure, Unix instructions apply.
-
-
-c) Build instructions
-
-Assuming that you installed the wxWidgets sources into c:\wxWidgets:
-
--> Copy c:\wxWidgets\include\wx\msw\setup0.h
-   to   c:\wxWidgets\include\wx\msw\setup.h
--> Edit c:\wxWidgets\include\wx\msw\setup.h to choose
-   the features you would like to compile wxWidgets with[out].
-
-   and std iostreams are disabled with
-   #define wxUSE_STD_IOSTREAM   0
-
--> type: cd c:\wxWidgets\build\msw
--> type: make -f makefile.gcc  (if using GNU tools)
-or type: nmake -f makefile.vc   (if using MS VC++)
-etc.
-
-   See also docs/msw/install.txt for additional compilation options.
-
-d) Borland (including free command line tools)
-   Download tools from http://www.borland.com/downloads/
-
-   See docs/msw/install.txt for details; in brief:
-
--> type cd c:\wxWidgets\build\msw
--> type make -f makefile.bcc
-
-You can customize many things in the build process, detailed description is
-in docs/msw/install.txt.
-
-
-II) Unix ports
---------------
-
-Building wxGTK or wxMotif completely without configure
-won't ever work, but there is now a new makefile system
-that works without libtool and automake, using only
-configure to create what is needed.
-
-In order to create configure, you need to have the
-GNU autoconf package (version > 2.54) installed
-on your system and type run "autoconf" in the base
-directory (or run the autogen.sh script in the same
-directory, which just calls autoconf). Note that you usually don't
-need to do this because configure is included in SVN.
-
-Set WXWIN environment variable to the base directory such
-as ~/wxWidgets (this is actually not really needed).
-
--> type: export WXWIN=~/wxWidgets
--> type: md mybuild
--> type: cd mybuild
--> type: ../configure --with-motif
-or type: ../configure --with-gtk
--> type: make
--> type: su <type root password>
--> type: make install
--> type: ldconfig
--> type: exit
-
-Call configure with --disable-shared to create a static
-library. Calling "make uninstall" will remove the installed
-library and "make dist" will create a distribution (not
-yet complete).
-
-III) Windows using configure
-----------------------------------------
-
-wxWidgets can be built on Windows using MSYS (see
-http://www.mingw.org/), which is a POSIX build environment
-for Windows. With MSYS you can just ./configure && make (see also VII,
-Unix->Windows cross-compiling using configure).
-
-Of course, you can also build the library using plain makefiles (see
-section I).
-
-IV) Classic MacOS using CodeWarrior (eg MacOS 8.x/9.x)
-----------------------------------------
-
-Refer to the readme.txt and install.txt files in docs/mac to build
-wxWidgets under Classic Mac OS using CodeWarrior.
-
-If you are checking out the SVN sources using svn under Mac OS X and
-compiling under Classic Mac OS:
-
-- make sure that all text files have a Mac OS type of 'TEXT' otherwise
-  CodeWarrior may ignore them. Checking out the SVN sources using svn
-  under Mac OS X creates untyped files which can lead to compilation
-  errors under CodeWarrior which are hard to track down.
-
-- convert the xml files to CodeWarrior binary projects using the supplied
-  AppleScript in docs/mac (M5xml2mcp.applescript for CodeWarrior 5.3)
-
-V) MacOS X using configure and the Developer Tools
-----------------------------------------
-
-You need to have the Developer Tools installed. If this is not the case,
-you will need to register at the Apple Developer web site (this is a free
-registration) in order to download the Developer Tools installer.
-
-In order to create configure, you need to have the
-GNU autoconf package (version >= 2.54) installed
-on your system and type run "autoconf" in the base
-directory (or run the autogen.sh script in the same
-directory, which just calls autoconf).
-
--> type: mkdir macbuild
--> type: cd macbuild
--> type: ../configure --with-mac
-or type: ../configure
--> type: make
-
-VI) OS/2
-----------------------------------------
-No notes.
-
-VII) Unix->Windows cross-compiling using configure
---------------------------------------------------
-
-First you'll need a cross-compiler; linux glibc binaries of MinGW and
-Cygwin (both based on egcs) can be found at
-ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries,
-based on the latest MinGW release can be found at
-http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
-Otherwise you can compile one yourself.
-
-[ A Note about Cygwin and MinGW: the main difference is that Cygwin
-binaries are always linked against cygwin.dll. This dll encapsulates most
-standard Unix C extensions, which is very handy if you're porting unix
-software to windows. However, wxMSW doesn't need this, so MinGW is
-preferable if you write portable C(++). ]
-
-You might want to build both Unix and Windows binaries in the same source
-tree; to do this make subdirs for each e.g. unix and win32. If you've
-already build wxWidgets in the main dir, do a 'make distclean' there,
-otherwise configure will get confused. (In any case, read the section 'Unix
-using configure' and make sure you're able to build a native wxWidgets
-library; cross-compiling errors can be pretty obscure and you'll want to be
-sure that your configure setup is basically sound.)
-
-To cross compile the windows library, do
--> cd win32
-(or whatever you called it)
-Now run configure. There are two ways to do this
--> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw
-where --build= should read whatever platform you're building on. Configure
-will notice that build and host platforms differ, and automatically prepend
-i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
-The other way to run configure is by specifying the names of the binaries
-yourself:
--> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
-   DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
-   ../configure --host=i586-mingw32 --with-mingw
-
-(all assuming you're using MinGW)
-By default this will compile a DLL, if you want a static library,
-specify --disable-shared.
-
-Type
--> make
-and wait, wait, wait. Don't leave the room, because the minute you do there
-will be a compile error :-)
-
-NB: if you are using a very old compiler you risk to get quite a few warnings
-    about "ANSI C++ forbids implicit conversion from 'void *'" in all places
-    where va_arg macro is used. This is due to a bug in (some versions of)
-    MinGW headers which may be corrected by upgrading your compier,
-    otherwise you might edit the file
-
-    ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
-
-    (instead of egcs-2.91.57 you may have something different), searching for
-    the lines
-
-/* Define __gnuc_va_list.  */
-
-#ifndef __GNUC_VA_LIST
-#define __GNUC_VA_LIST
-#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
-typedef char *__gnuc_va_list;
-#else
-typedef void *__gnuc_va_list;
-#endif
-#endif
-
-    and adding "|| defined(_WIN32)" to the list of platforms on which
-    __gnuc_va_list is char *.
-
-If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib
-(or just libwx_msw.a if you opted for a static build).
-Now try building the minimal sample:
-
--> cd samples/minimal
--> make
-
-and run it with wine, for example (or copy to a Windows box)
--> wine minimal.exe
-
-If all is well, do an install; from win32
--> make install
-
-Native and cross-compiled installations can co-exist peacefully
-(as long as their widget sets differ), except for wx-config. You might
-want to rename the cross-compiled one to i586-mingw32-wx-config, or something.
-
-Cross-compiling TODO:
----------------------
-- resource compiling must be done manually for now (should/can we link the
-default wx resources into libwx_msw.a?) [ No we can't; the linker won't
-link it in... you have to supply an object file ]
-- static executables are HUGE -- there must be room for improvement.
-

acinclude.m4

@@ -132,7 +132,7 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
 
-    AC_CHECK_HEADERS([iostream],,, [ ])
+    AC_CHECK_HEADERS(iostream,,, [ ])
 
     if test "$ac_cv_header_iostream" = "yes" ; then
       ifelse([$1], , :, [$1])
@@ -357,13 +357,10 @@ AC_DEFUN([WX_ARG_CACHE_NAME],)
 dnl this macro checks for a three-valued command line --with argument:
 dnl   possible arguments are 'yes', 'no', 'sys', or 'builtin'
 dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
-dnl
-dnl the default value (used if the option is not specified at all) is the value
-dnl of wxUSE_ALL_FEATURES (which is "yes" by default but can be changed by
-dnl giving configure --disable-all-features option)
 AC_DEFUN([WX_ARG_SYS_WITH],
         [
           AC_MSG_CHECKING([for --with-$1])
+          no_cache=0
           AC_ARG_WITH($1, [$2],
                       [
                         if test "$withval" = yes; then
@@ -377,23 +374,21 @@ AC_DEFUN([WX_ARG_SYS_WITH],
                         else
                           AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
                         fi
-                        cache=yes
                       ],
                       [
-                        LINE=`grep "^$3=" ${wx_arg_cache_file}`
+                        LINE=`grep "$3" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                          eval "DEFAULT_$LINE"
-                            cache=yes
                         else
-                            cache=no
+                          no_cache=1
                         fi
 
-                        AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$wxUSE_ALL_FEATURES}"
+                        AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
                       ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
-          if test "x$cache" = xyes; then
+          if test "$no_cache" != 1; then
-            echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
+            echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$$3" = yes; then
@@ -414,15 +409,8 @@ dnl usage: WX_ARG_WITH(option, helpmessage, variable-name, [withstring])
 AC_DEFUN([WX_ARG_WITH],
         [
           withstring=$4
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$withstring" = xwithout; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
           AC_MSG_CHECKING([for --${withstring:-with}-$1])
+          no_cache=0
           AC_ARG_WITH($1, [$2],
                       [
                         if test "$withval" = yes; then
@@ -430,64 +418,41 @@ AC_DEFUN([WX_ARG_WITH],
                         else
                           AS_TR_SH(wx_cv_use_$1)='$3=no'
                         fi
-                        cache=yes
                       ],
                       [
-                        LINE=`grep "^$3=" ${wx_arg_cache_file}`
+                        LINE=`grep "$3" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                          eval "DEFAULT_$LINE"
-                            cache=yes
                         else
-                            cache=no
+                          no_cache=1
                         fi
 
-                        AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
+                        AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
                       ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
-          if test "x$cache" = xyes; then
+          if test "$no_cache" != 1; then
-            echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
+            echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test x"$withstring" = xwithout; then
+          if test "$$3" = yes; then
-            if test $$3 = yes; then
+            AC_MSG_RESULT(yes)
-              result=no
-            else
-              result=yes
-            fi
           else
-            result=$$3
+            AC_MSG_RESULT(no)
           fi
-
-          AC_MSG_RESULT($result)
         ])
 
-dnl same as WX_ARG_WITH but makes it clear that the option is enabled by default
-AC_DEFUN([WX_ARG_WITHOUT], [WX_ARG_WITH($1, [$2], $3, without)])
-
 dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
-dnl usage: WX_ARG_ENABLE(option, helpmessage, var, [enablestring], [default])
+dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name, enablestring)
 dnl
-dnl enablestring can be omitted or a literal string "disable" and allows to
+dnl enablestring is a hack and allows to show "checking for --disable-foo"
-dnl show "checking for --disable-foo" message when running configure instead of
+dnl message when running configure instead of the default "checking for
-dnl the default "checking for --enable-foo" one whih is useful for the options
+dnl --enable-foo" one whih is useful for the options enabled by default
-dnl enabled by default
-dnl
-dnl the "default" argument can be omitted or contain the default value to use
-dnl for the option if it's unspecified
 AC_DEFUN([WX_ARG_ENABLE],
         [
           enablestring=$4
-          defaultval=$5
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
           AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
+          no_cache=0
           AC_ARG_ENABLE($1, [$2],
                         [
                           if test "$enableval" = yes; then
@@ -495,44 +460,30 @@ AC_DEFUN([WX_ARG_ENABLE],
                           else
                             AS_TR_SH(wx_cv_use_$1)='$3=no'
                           fi
-                          cache=yes
                         ],
                         [
-                          LINE=`grep "^$3=" ${wx_arg_cache_file}`
+                          LINE=`grep "$3" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
-                              cache=yes
                           else
-                              cache=no
+                            no_cache=1
                           fi
 
-                          AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
+                          AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
                         ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
-          if test "x$cache" = xyes; then
+          if test "$no_cache" != 1; then
-            echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
+            echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test x"$enablestring" = xdisable; then
+          if test "$$3" = yes; then
-            if test $$3 = yes; then
+            AC_MSG_RESULT(yes)
-              result=no
-            else
-              result=yes
-            fi
           else
-            result=$$3
+            AC_MSG_RESULT(no)
           fi
-
-          AC_MSG_RESULT($result)
         ])
 
-dnl the same as WX_ARG_ENABLE but makes it more clear that the option is
-dnl enabled by default
-AC_DEFUN([WX_ARG_DISABLE], [WX_ARG_ENABLE($1, [$2], $3, disable)])
-
-dnl same as WX_ARG_ENABLE but defaults to wxUSE_ALL_FEATURES instead of "yes"
-AC_DEFUN([WX_ARG_FEATURE], [WX_ARG_ENABLE($1, [$2], $3,, $wxUSE_ALL_FEATURES)])
 
 dnl Like WX_ARG_ENABLE but accepts a parameter.
 dnl
@@ -545,33 +496,31 @@ dnl
 dnl  --enable-foo       wxUSE_FOO=yes
 dnl  --disable-foo      wxUSE_FOO=no
 dnl  --enable-foo=bar   wxUSE_FOO=bar
-dnl  <not given>        value from configarg.cache or
+dnl  <not given>        value from configarg.cache or wxUSE_FOO=no
-dnl                     wxUSE_FOO=$DEFAULT_wxUSE_FOO
 dnl
 AC_DEFUN([WX_ARG_ENABLE_PARAM],
         [
           enablestring=$4
           AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
+          no_cache=0
           AC_ARG_ENABLE($1, [$2],
                         [
                           wx_cv_use_$1="$3='$enableval'"
-                          cache=yes
                         ],
                         [
-                          LINE=`grep "^$3=" ${wx_arg_cache_file}`
+                          LINE=`grep "$3" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                            cache=yes
+                            wx_cv_use_$1='$3='$DEFAULT_$3
                           else
-                            cache=no
+                            no_cache=1
+                            wx_cv_use_$1="$3=no"
                           fi
-
-                          wx_cv_use_$1='$3='$DEFAULT_$3
                         ])
 
           eval "$wx_cv_use_$1"
-          if test "x$cache" = xyes; then
+          if test "$no_cache" != 1; then
-            echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_$1 >> ${wx_arg_cache_file}.tmp
           fi
 
           AC_MSG_RESULT([$$3])

aclocal.m4

@@ -12,7 +12,6 @@
 # PARTICULAR PURPOSE.
 
 m4_include([build/aclocal/ac_raf_func_which_getservbyname_r.m4])
-m4_include([build/aclocal/atomic_builtins.m4])
 m4_include([build/aclocal/ax_func_which_gethostbyname_r.m4])
 m4_include([build/aclocal/bakefile-dllar.m4])
 m4_include([build/aclocal/bakefile-lang.m4])
@@ -22,5 +21,4 @@ m4_include([build/aclocal/gtk-2.0.m4])
 m4_include([build/aclocal/gtk.m4])
 m4_include([build/aclocal/pkg.m4])
 m4_include([build/aclocal/sdl.m4])
-m4_include([build/aclocal/visibility.m4])
 m4_include([acinclude.m4])

art/addbookm.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *addbookm_xpm[] = {
+static const char * addbookm_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 ". c Black",

art/back.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char * back_xpm[] = {
+static const char * back_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",

art/cdrom.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *cdrom_xpm[] = {
+static const char * cdrom_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 36 1",
 "= c #9BACC2",

art/copy.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *copy_xpm[] = {
+static const char * copy_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 23 1",
 "o c #97C4E7",

art/cross.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *cross_xpm[] = {
+static const char * cross_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "10 10 2 1",
 "  c Gray0",

art/cut.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *cut_xpm[] = {
+static const char * cut_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 25 1",
 "6 c #D8BDC0",

art/deffile.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *deffile_xpm[] = {
+static const char * deffile_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 32 1",
 "= c #97C4E7",

art/delbookm.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *delbookm_xpm[] = {
+static const char * delbookm_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 ". c Black",

art/delete.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *delete_xpm[] = {
+static const char * delete_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 21 1",
 "2 c #A5AEBD",

art/dir_up.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *dir_up_xpm[] = {
+static const char * dir_up_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 31 1",
 "6 c #9BACC2",

art/down.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char * down_xpm[] = {
+static const char * down_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",

art/exefile.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *exefile_xpm[] = {
+static const char * exefile_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 51 1",
 "% c #E8E8EC",

art/fileopen.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *fileopen_xpm[] = {
+static const char * fileopen_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 36 1",
 "6 c #9BACC2",

art/filesave.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *filesave_xpm[] = {
+static const char * filesave_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 21 1",
 "O c #FFFFFF",

art/filesaveas.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *filesaveas_xpm[] = {
+static const char * filesaveas_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 23 1",
 "X c Black",

art/find.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *find_xpm[] = {
+static const char * find_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 41 1",
 "y c #A06959",

art/findrepl.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *findrepl_xpm[] = {
+static const char * findrepl_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 42 1",
 "y c #A06959",

art/floppy.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *floppy_xpm[] = {
+static const char * floppy_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 18 1",
 "& c #E3E4E6",

art/folder.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *folder_xpm[] = {
+static const char * folder_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 22 1",
 "> c #9BACC2",

art/folder_open.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *folder_open_xpm[] = {
+static const char * folder_open_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 31 1",
 "6 c #9BACC2",

art/forward.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char * forward_xpm[] = {
+static const char * forward_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",

art/gtk/error.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *error_xpm[] = {
+static const char * error_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 4 1",
 "  c None",

art/gtk/info.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *info_xpm[] = {
+static const char * info_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 9 1",
 "$ c Black",

art/gtk/question.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *question_xpm[] = {
+static const char * question_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 21 1",
 ". c Black",

art/gtk/warning.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *warning_xpm[] = {
+static const char * warning_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 9 1",
 "@ c Black",

art/harddisk.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *harddisk_xpm[] = {
+static const char * harddisk_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 39 1",
 "7 c #E3E4E6",

art/helpicon.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *helpicon_xpm[] = {
+static const char * helpicon_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Gray0",

art/home.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *home_xpm[] = {
+static const char * home_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 ". c Black",

art/htmbook.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char * htmbook_xpm[] = {
+static const char * htmbook_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c Black",

art/htmfoldr.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char * htmfoldr_xpm[] = {
+static const char * htmfoldr_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c Black",

art/htmoptns.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char * htmoptns_xpm[] = {
+static const char * htmoptns_xpm[] = {
 "16 15 2 1",
 " 	c None",
 ".	c #000000",

art/htmpage.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char * htmpage_xpm[] = {
+static const char * htmpage_xpm[] = {
 "16 16 4 1",
 " 	c None",
 ".	c #808080",

art/htmsidep.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *htmsidep_xpm[] = {
+static const char * htmsidep_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 6 1",
 ". c Black",

art/listview.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *listview_xpm[] = {
+static const char * listview_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 4 1",
 "  c Black",

art/missimg.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *missimg_xpm[] = {
+static const char * missimg_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 5 1",
 "X c Black",

art/motif/error.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *error_xpm[] = {
+static const char * error_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 4 1",
 "  c None",

art/motif/info.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *info_xpm[] = {
+static const char * info_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 9 1",
 "$ c Black",

art/motif/question.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *question_xpm[] = {
+static const char * question_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 21 1",
 ". c Black",

art/motif/warning.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *warning_xpm[] = {
+static const char * warning_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 9 1",
 "@ c Black",

art/new.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *new_xpm[] = {
+static const char * new_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 29 1",
 "* c #97C4E7",

art/new_dir.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *new_dir_xpm[] = {
+static const char * new_dir_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 22 1",
 "X c Black",

art/paste.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *paste_xpm[] = {
+static const char * paste_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 25 1",
 "< c #FEECE4",

art/print.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *print_xpm[] = {
+static const char * print_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 39 1",
 "< c #E3E4E6",

art/quit.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *quit_xpm[] = {
+static const char * quit_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 69 1",
 "@ c Black",

art/redo.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *redo_xpm[] = {
+static const char * redo_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 37 1",
 "4 c #9BACC2",

art/removable.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *removable_xpm[] = {
+static const char * removable_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 23 1",
 "@ c #C3C3C4",

art/repview.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *repview_xpm[] = {
+static const char * repview_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 "  c Black",

art/tick.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *tick_xpm[] = {
+static const char * tick_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "10 10 2 1",
 ". c Gray0",

art/tipicon.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *tipicon_xpm[] = {
+static const char * tipicon_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 9 1",
 "$ c Black",

art/toparent.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char * toparent_xpm[] = {
+static const char * toparent_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",

art/undo.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *undo_xpm[] = {
+static const char * undo_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 37 1",
 "4 c #9BACC2",

art/up.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char * up_xpm[] = {
+static const char * up_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",

art/wxwin16x16.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *wxwin16x16_xpm[] = {
+static const char * wxwin16x16_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c #000000",

art/wxwin32x32.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *wxwin32x32_xpm[] = {
+static const char * wxwin32x32_xpm[] = {
 "32 32 6 1",
 " 	c None",
 ".	c #000000",

autogen.sh

@@ -1,2 +1,3 @@
 #!/bin/sh
-autoconf
+#autoconf
+make -f build/autogen.mk

build/.cvsignore

@@ -0,0 +1 @@
+wince

build/aclocal/atomic_builtins.m4

@@ -1,26 +0,0 @@
-
-dnl Checks for availability of GCC's atomic operations builtins.
-dnl Defines HAVE_GCC_ATOMIC_BUILTINS if available.
-
-AC_DEFUN([WX_ATOMIC_BUILTINS],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  if test -n "$GCC"; then
-    AC_MSG_CHECKING([for __sync_fetch_* builtins])
-    AC_CACHE_VAL(wx_cv_cc_gcc_atomic_builtins, [
-      AC_TRY_COMPILE(
-        [],
-        [
-          int value=0;
-          __sync_fetch_and_add(&value, 1);
-          __sync_sub_and_fetch(&value, 1);
-        ],
-        wx_cv_cc_gcc_atomic_builtins=yes,
-        wx_cv_cc_gcc_atomic_builtins=no)
-      ])
-    AC_MSG_RESULT([$wx_cv_cc_gcc_atomic_builtins])
-    if test $wx_cv_cc_gcc_atomic_builtins = yes; then
-      AC_DEFINE([HAVE_GCC_ATOMIC_BUILTINS])
-    fi
-  fi
-])

build/aclocal/bakefile-lang.m4

@@ -59,6 +59,36 @@ AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
     AC_LANG_POP($2)
 ])
 
+dnl More specific version of the above macro checking whether the compiler
+dnl version is at least the given one (assumes that we do use this compiler)
+dnl
+dnl _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(NAME, LANG, SYMBOL, VER, VERMSG, IF-YES, IF-NO)
+AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_LATER_THAN],
+[
+    AC_LANG_PUSH($2)
+    AC_CACHE_CHECK(
+        [whether we are using $1 $2 compiler v$5 or later],
+        [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4],
+        [AC_TRY_COMPILE(
+            [],
+            [
+             #ifndef $3 || $3 < $4
+                choke me
+             #endif
+            ],
+            [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=yes],
+            [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=no]
+         )
+        ]
+    )
+    if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4" = "xyes"; then
+        :; $6
+    else
+        :; $7
+    fi
+    AC_LANG_POP($2)
+])
+
 dnl CodeWarrior Metrowerks compiler defines __MWERKS__ for both C and C++
 AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
 [
@@ -117,6 +147,29 @@ AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX],
     _AC_BAKEFILE_LANG_COMPILER(Intel, C++, __INTEL_COMPILER, INTELCXX=yes)
 ])
 
+dnl Intel compiler command line options changed in incompatible ways sometimes
+dnl before v8 (-KPIC was replaced with gcc-compatible -fPIC) and again in v10
+dnl (-create-pch deprecated in favour of -pch-create) so we need to test for
+dnl its exact version too
+AC_DEFUN([AC_BAKEFILE_PROG_INTELCC_8],
+[
+    _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C, __INTEL_COMPILER, 800, 8, INTELCC8=yes)
+])
+AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX_8],
+[
+    _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C++, __INTEL_COMPILER, 800, 8, INTELCXX8=yes)
+])
+
+AC_DEFUN([AC_BAKEFILE_PROG_INTELCC_10],
+[
+    _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C, __INTEL_COMPILER, 1000, 10, INTELCC10=yes)
+])
+
+AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX_10],
+[
+    _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C++, __INTEL_COMPILER, 1000, 10, INTELCXX10=yes)
+])
+
 dnl HP-UX aCC: see http://docs.hp.com/en/6162/preprocess.htm#macropredef
 AC_DEFUN([AC_BAKEFILE_PROG_HPCC],
 [
@@ -194,6 +247,12 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
     dnl always test for it
     AC_BAKEFILE_PROG_INTEL$1
 
+    dnl If we use Intel compiler we also need to know its version
+    if test "$INTEL$1" = "yes"; then
+        AC_BAKEFILE_PROG_INTEL$1_8
+        AC_BAKEFILE_PROG_INTEL$1_10
+    fi
+
     dnl if we're using gcc, we can't be using any of incompatible compilers
     if test "x$G$1" != "xyes"; then
         if test "x$1" = "xC"; then
@@ -213,7 +272,9 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
 
             Darwin)
                 AC_BAKEFILE_PROG_MW$1
-                AC_BAKEFILE_PROG_XL$1
+                if test "$MW$1" != "yes"; then
+                    AC_BAKEFILE_PROG_XL$1
+                fi
                 ;;
 
             IRIX*)
@@ -221,8 +282,11 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
                 ;;
 
             Linux*)
-                dnl Sun CC is now available under Linux too
+                dnl Sun CC is now available under Linux too, test for it unless
-                AC_BAKEFILE_PROG_SUN$1
+                dnl we already found that we were using a different compiler
+                if test "$INTEL$1" != "yes"; then
+                    AC_BAKEFILE_PROG_SUN$1
+                fi
                 ;;
 
             HP-UX*)

build/aclocal/bakefile.m4

@@ -1,5 +1,5 @@
 dnl
-dnl  This file is part of Bakefile (http://bakefile.sourceforge.net)
+dnl  This file is part of Bakefile (http://www.bakefile.org)
 dnl
 dnl  Copyright (C) 2003-2007 Vaclav Slavik and others
 dnl
@@ -126,8 +126,7 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
                 PLATFORM_BEOS=1
             ;;
             * )
-                dnl wxWidgets-specific: allow unknown Unix systems
+                AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
-                dnl AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
             ;;
         esac
     fi
@@ -208,6 +207,10 @@ AC_DEFUN([AC_BAKEFILE_SUFFIXES],
     dlldir="$libdir"
 
     case "${BAKEFILE_HOST}" in
+        dnl PA-RISC HP systems used .sl but IA64 use ELF-64 and so use the
+        dnl standard .so extension
+        ia64-hp-hpux* )
+        ;;
         *-hp-hpux* )
             SO_SUFFIX="sl"
             SO_SUFFIX_MODULE="sl"
@@ -309,7 +312,9 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
       ;;
 
       *-*-linux* )
-        if test "$INTELCC" = "yes"; then
+        dnl newer icc versions use -fPIC just as gcc does and, in fact, the
+        dnl newest (v10+) ones don't even understand -KPIC any longer
+        if test "$INTELCC" = "yes" -a "$INTELCC8" != "yes"; then
             PIC_FLAG="-KPIC"
         elif test "x$SUNCXX" = "xyes"; then
             SHARED_LD_CC="${CC} -G -o"
@@ -331,7 +336,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
         chmod +x shared-ld-sh
 
         SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
-        SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
+        SHARED_LD_MODULE_CXX="CXX=\"\$(CXX)\" $SHARED_LD_MODULE_CC"
 
         dnl Most apps benefit from being fully binded (its faster and static
         dnl variables initialized at startup work).
@@ -484,12 +489,13 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
     USE_SOVERLINUX=0
     USE_SOVERSOLARIS=0
     USE_SOVERCYGWIN=0
-    USE_SOSYMLINKS=0
+    USE_SOTWOSYMLINKS=0
     USE_MACVERSION=0
     SONAME_FLAG=
 
     case "${BAKEFILE_HOST}" in
-      *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu )
+      *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+      *-*-k*bsd*-gnu | *-*-mirbsd* )
         if test "x$SUNCXX" = "xyes"; then
             SONAME_FLAG="-h "
         else
@@ -497,20 +503,19 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
         fi
         USE_SOVERSION=1
         USE_SOVERLINUX=1
-        USE_SOSYMLINKS=1
+        USE_SOTWOSYMLINKS=1
       ;;
 
       *-*-solaris2* )
         SONAME_FLAG="-h "
         USE_SOVERSION=1
         USE_SOVERSOLARIS=1
-        USE_SOSYMLINKS=1
       ;;
 
       *-*-darwin* )
         USE_MACVERSION=1
         USE_SOVERSION=1
-        USE_SOSYMLINKS=1
+        USE_SOTWOSYMLINKS=1
       ;;
 
       *-*-cygwin* )
@@ -524,7 +529,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
     AC_SUBST(USE_SOVERSOLARIS)
     AC_SUBST(USE_SOVERCYGWIN)
     AC_SUBST(USE_MACVERSION)
-    AC_SUBST(USE_SOSYMLINKS)
+    AC_SUBST(USE_SOTWOSYMLINKS)
     AC_SUBST(SONAME_FLAG)
 ])
 
@@ -639,18 +644,21 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
     AC_CHECK_TOOL(STRIP, strip, :)
     AC_CHECK_TOOL(NM, nm, :)
 
-    case ${BAKEFILE_HOST} in
+    dnl This check is necessary because "install -d" doesn't exist on
-        *-hp-hpux* )
+    dnl all platforms (e.g. HP/UX), see http://www.bakefile.org/ticket/80
-            dnl HP-UX install doesn't handle the "-d" switch so don't
+    AC_MSG_CHECKING([for command to install directories])
-            dnl use it there
+    INSTALL_TEST_DIR=acbftest$$
-            INSTALL_DIR="mkdir -p"
+    $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1
-            ;;
+    if test $? = 0 -a -d $INSTALL_TEST_DIR; then
-        * )
+        rmdir $INSTALL_TEST_DIR
-            dnl we must refer to makefile's $(INSTALL) variable and not
+        dnl we must refer to makefile's $(INSTALL) variable and not
-            dnl current value of shell variable, hence the single quoting:
+        dnl current value of shell variable, hence the single quoting:
-            INSTALL_DIR='$(INSTALL) -d'
+        INSTALL_DIR='$(INSTALL) -d'
-            ;;
+        AC_MSG_RESULT([$INSTALL -d])
-    esac
+    else
+        INSTALL_DIR="mkdir -p"
+        AC_MSG_RESULT([mkdir -p])
+    fi
     AC_SUBST(INSTALL_DIR)
 
     LDFLAGS_GUI=
@@ -739,20 +747,19 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
                     GCC_PCH=1
                 ],
                 [
-                    AC_TRY_COMPILE([],
+                    if test "$INTELCXX8" = "yes"; then
-                        [
+                        AC_MSG_RESULT([yes])
-                            #if !defined(__INTEL_COMPILER) || \
+                        ICC_PCH=1
-                                (__INTEL_COMPILER < 800)
+                        if test "$INTELCXX10" = "yes"; then
-                                There is no PCH support
+                            ICC_PCH_CREATE_SWITCH="-pch-create"
-                            #endif
+                            ICC_PCH_USE_SWITCH="-pch-use"
-                        ],
+                        else
-                        [
+                            ICC_PCH_CREATE_SWITCH="-create-pch"
-                            AC_MSG_RESULT([yes])
+                            ICC_PCH_USE_SWITCH="-use-pch"
-                            ICC_PCH=1
+                        fi
-                        ],
+                    else
-                        [
+                        AC_MSG_RESULT([no])
-                            AC_MSG_RESULT([no])
+                    fi
-                        ])
                 ])
             if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then
                 USE_PCH=1
@@ -768,6 +775,8 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
 
     AC_SUBST(GCC_PCH)
     AC_SUBST(ICC_PCH)
+    AC_SUBST(ICC_PCH_CREATE_SWITCH)
+    AC_SUBST(ICC_PCH_USE_SWITCH)
     AC_SUBST(BK_MAKE_PCH)
 ])
 
@@ -798,6 +807,12 @@ AC_DEFUN([AC_BAKEFILE],
 [
     AC_PREREQ([2.58])
 
+    dnl We need to always run C/C++ compiler tests, but it's also possible
+    dnl for the user to call these macros manually, hence this instead of
+    dnl simply calling these macros. See http://www.bakefile.org/ticket/64
+    AC_REQUIRE([AC_BAKEFILE_PROG_CC])
+    AC_REQUIRE([AC_BAKEFILE_PROG_CXX])
+
     if test "x$BAKEFILE_HOST" = "x"; then
                if test "x${host}" = "x" ; then
                        AC_MSG_ERROR([You must call the autoconf "CANONICAL_HOST" macro in your configure.ac (or .in) file.])
@@ -818,7 +833,11 @@ AC_DEFUN([AC_BAKEFILE],
     AC_BAKEFILE_DEPS
     AC_BAKEFILE_RES_COMPILERS
 
-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.2"
+    dnl OBJCFLAGS is set by Autoconf, but OBJCXXFLAGS is not:
+    AC_SUBST(OBJCXXFLAGS)
+
+
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.8"
 
     dnl includes autoconf_inc.m4:
     $1
@@ -846,24 +865,20 @@ D='$'
 cat <<EOF >bk-deps
 #!/bin/sh
 
-# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
+# This script is part of Bakefile (http://www.bakefile.org) autoconf
 # script. It is used to track C/C++ files dependencies in portable way.
 #
 # Permission is given to use this file in any way.
 
 DEPSMODE=${DEPSMODE}
-DEPSDIR=.deps
 DEPSFLAG="${DEPSFLAG}"
-
+DEPSDIRBASE=.deps
-mkdir -p ${D}DEPSDIR
 
 if test ${D}DEPSMODE = gcc ; then
     ${D}* ${D}{DEPSFLAG}
     status=${D}?
-    if test ${D}{status} != 0 ; then
+
-        exit ${D}{status}
+    # determine location of created files:
-    fi
-    # move created file to the location we want it in:
     while test ${D}# -gt 0; do
         case "${D}1" in
             -o )
@@ -878,24 +893,37 @@ if test ${D}DEPSMODE = gcc ; then
         esac
         shift
     done
+    objfilebase=\`basename ${D}objfile\`
+    builddir=\`dirname ${D}objfile\`
     depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
     depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
+    depsdir=${D}builddir/${D}DEPSDIRBASE
+    mkdir -p ${D}depsdir
+
+    # if the compiler failed, we're done:
+    if test ${D}{status} != 0 ; then
+        rm -f ${D}depfile
+        exit ${D}{status}
+    fi
+
+    # move created file to the location we want it in:
     if test -f ${D}depfile ; then
-        sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
+        sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
         rm -f ${D}depfile
     else
         # "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d
-        depfile=\`basename ${D}objfile | sed -e 's/\\..*${D}/.d/g'\`
+        depfile=\`echo "${D}objfile" | sed -e 's/\\..*${D}/.d/g'\`
         if test ! -f ${D}depfile ; then
             # "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++)
             depfile="${D}objfile.d"
         fi
         if test -f ${D}depfile ; then
-            sed -e "/^${D}objfile/!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
+            sed -e "\\,^${D}objfile,!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
             rm -f ${D}depfile
         fi
     fi
     exit 0
+
 elif test ${D}DEPSMODE = mwcc ; then
     ${D}* || exit ${D}?
     # Run mwcc again with -MM and redirect into the dep file we want
@@ -915,8 +943,15 @@ elif test ${D}DEPSMODE = mwcc ; then
         fi
         prevarg="${D}arg"
     done
-    ${D}* ${D}DEPSFLAG >${D}{DEPSDIR}/${D}{objfile}.d
+
+    objfilebase=\`basename ${D}objfile\`
+    builddir=\`dirname ${D}objfile\`
+    depsdir=${D}builddir/${D}DEPSDIRBASE
+    mkdir -p ${D}depsdir
+
+    ${D}* ${D}DEPSFLAG >${D}{depsdir}/${D}{objfilebase}.d
     exit 0
+
 elif test ${D}DEPSMODE = unixcc; then
     ${D}* || exit ${D}?
     # Run compiler again with deps flag and redirect into the dep file.
@@ -937,8 +972,15 @@ elif test ${D}DEPSMODE = unixcc; then
         esac
         shift
     done
-    eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{DEPSDIR}/${D}{objfile}.d
+
+    objfilebase=\`basename ${D}objfile\`
+    builddir=\`dirname ${D}objfile\`
+    depsdir=${D}builddir/${D}DEPSDIRBASE
+    mkdir -p ${D}depsdir
+
+    eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{depsdir}/${D}{objfilebase}.d
     exit 0
+
 else
     ${D}*
     exit ${D}?
@@ -969,6 +1011,10 @@ objects=""
 linking_flag="-dynamiclib"
 ldargs="-r -keep_private_externs -nostdlib"
 
+if test "x${D}CXX" = "x"; then
+    CXX="c++"
+fi
+
 while test ${D}# -gt 0; do
     case ${D}1 in
 
@@ -981,6 +1027,12 @@ while test ${D}# -gt 0; do
         args="${D}{args} ${D}1 ${D}2"
         shift
         ;;
+       
+       -arch|-isysroot)
+        # collect these options and values
+        ldargs="${D}{ldargs} ${D}1 ${D}2"
+        shift
+        ;;
 
        -s|-Wl,*)
         # collect these load args
@@ -1021,9 +1073,9 @@ status=0
 # Link one module containing all the others
 #
 if test ${D}{verbose} = 1; then
-    echo "c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
+    echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
 fi
-c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
+${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
 status=${D}?
 
 #
@@ -1032,9 +1084,9 @@ status=${D}?
 #
 if test ${D}{status} = 0; then
     if test ${D}{verbose} = 1; then
-        echo "c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
+        echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
     fi
-    c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}
+    ${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}
     status=${D}?
 fi
 
@@ -1057,7 +1109,7 @@ D='$'
 cat <<EOF >bk-make-pch
 #!/bin/sh
 
-# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
+# This script is part of Bakefile (http://www.bakefile.org) autoconf
 # script. It is used to generated precompiled headers.
 #
 # Permission is given to use this file in any way.
@@ -1067,6 +1119,8 @@ header="${D}{2}"
 shift
 shift
 
+builddir=\`echo ${D}outfile | sed -e 's,/\\.pch/.*${D},,g'\`
+
 compiler=""
 headerfile=""
 
@@ -1079,7 +1133,7 @@ while test ${D}{#} -gt 0; do
                 headerfile="${D}{incdir}/${D}{header}"
             fi
         ;;
-        -use-pch|-use_pch )
+        -use-pch|-use_pch|-pch-use )
             shift
             add_to_cmdline=0
         ;;
@@ -1098,8 +1152,8 @@ else
     else
         mkdir -p \`dirname ${D}{outfile}\`
     fi
-    depsfile=".deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
+    depsfile="${D}{builddir}/.deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
-    mkdir -p .deps
+    mkdir -p ${D}{builddir}/.deps
     if test "x${GCC_PCH}" = "x1" ; then
         # can do this because gcc is >= 3.4:
         ${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}"
@@ -1111,7 +1165,7 @@ else
 #include "${D}header"
 EOT
         # using -MF icc complains about differing command lines in creation/use
-        ${D}compiler -c -create_pch ${D}outfile -MMD ${D}file && \\
+        ${D}compiler -c ${ICC_PCH_CREATE_SWITCH} ${D}outfile -MMD ${D}file && \\
           sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\
           rm -f ${D}file ${D}dfile ${D}{filename}.o
     fi

build/aclocal/visibility.m4

@@ -1,132 +0,0 @@
-dnl visibility.m4 serial 1 (gettext-0.15)
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl Modified for use in wxWidgets by Vaclav Slavik:
-dnl    - don't define HAVE_VISIBILITY (=0) if not supported
-dnl    - use -fvisibility-inlines-hidden too
-dnl    - test in C++ mode
-
-dnl Tests whether the compiler supports the command-line option
-dnl -fvisibility=hidden and the function and variable attributes
-dnl __attribute__((__visibility__("hidden"))) and
-dnl __attribute__((__visibility__("default"))).
-dnl Does *not* test for __visibility__("protected") - which has tricky
-dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
-dnl MacOS X.
-dnl Does *not* test for __visibility__("internal") - which has processor
-dnl dependent semantics.
-dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
-dnl "really only recommended for legacy code".
-dnl Set the variable CFLAG_VISIBILITY.
-dnl Defines and sets the variable HAVE_VISIBILITY.
-
-AC_DEFUN([WX_VISIBILITY],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  if test -n "$GCC"; then
-    CFLAGS_VISIBILITY="-fvisibility=hidden"
-    CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden"
-    AC_MSG_CHECKING([for symbols visibility support])
-    AC_CACHE_VAL(wx_cv_cc_visibility, [
-      wx_save_CXXFLAGS="$CXXFLAGS"
-      CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
-      AC_LANG_PUSH(C++)
-      AC_TRY_COMPILE(
-        [
-         /* we need gcc >= 4.0, older versions with visibility support
-            didn't have class visibility: */
-         #if defined(__GNUC__) && __GNUC__ < 4
-         error this gcc is too old;
-         #endif
-
-         /* visibility only makes sense for ELF shared libs: */
-         #if !defined(__ELF__) && !defined(__APPLE__)
-         error this platform has no visibility;
-         #endif
-
-         extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-         extern __attribute__((__visibility__("default"))) int exportedvar;
-         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-         extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-         class __attribute__((__visibility__("default"))) Foo {
-           Foo() {}
-         };
-        ],
-        [],
-        wx_cv_cc_visibility=yes,
-        wx_cv_cc_visibility=no)
-      AC_LANG_POP()
-      CXXFLAGS="$wx_save_CXXFLAGS"])
-    AC_MSG_RESULT([$wx_cv_cc_visibility])
-    if test $wx_cv_cc_visibility = yes; then
-      dnl we do have basic visibility support, now check if we can use it:
-      dnl
-      dnl Debian/Ubuntu's gcc 4.1 is affected:
-      dnl https://bugs.launchpad.net/ubuntu/+source/gcc-4.1/+bug/109262
-      AC_MSG_CHECKING([for broken libstdc++ visibility])
-      AC_CACHE_VAL(wx_cv_cc_broken_libstdcxx_visibility, [
-        wx_save_CXXFLAGS="$CXXFLAGS"
-        wx_save_LDFLAGS="$LDFLAGS"
-        CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
-        LDFLAGS="$LDFLAGS -shared -fPIC"
-        AC_LANG_PUSH(C++)
-        AC_TRY_LINK(
-          [
-            #include <string>
-          ],
-          [
-            std::string s("hello");
-            return s.length();
-          ],
-          wx_cv_cc_broken_libstdcxx_visibility=no,
-          wx_cv_cc_broken_libstdcxx_visibility=yes)
-        AC_LANG_POP()
-        CXXFLAGS="$wx_save_CXXFLAGS"
-        LDFLAGS="$wx_save_LDFLAGS"])
-      AC_MSG_RESULT([$wx_cv_cc_broken_libstdcxx_visibility])
-
-      if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then
-        AC_MSG_CHECKING([whether we can work around it])
-        AC_CACHE_VAL(wx_cv_cc_visibility_workaround, [
-          AC_LANG_PUSH(C++)
-          AC_TRY_LINK(
-            [
-              #pragma GCC visibility push(default)
-              #include <string>
-              #pragma GCC visibility pop
-            ],
-            [
-              std::string s("hello");
-              return s.length();
-            ],
-            wx_cv_cc_visibility_workaround=no,
-            wx_cv_cc_visibility_workaround=yes)
-          AC_LANG_POP()
-        ])
-        AC_MSG_RESULT([$wx_cv_cc_visibility_workaround])
-
-        if test $wx_cv_cc_visibility_workaround = no; then
-          dnl we can't use visibility at all then
-          wx_cv_cc_visibility=no
-        fi
-      fi
-    fi
-
-    if test $wx_cv_cc_visibility = yes; then
-      AC_DEFINE([HAVE_VISIBILITY])
-      if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then
-        AC_DEFINE([HAVE_BROKEN_LIBSTDCXX_VISIBILITY])
-      fi
-    else
-      CFLAGS_VISIBILITY=""
-      CXXFLAGS_VISIBILITY=""
-    fi
-    AC_SUBST([CFLAGS_VISIBILITY])
-    AC_SUBST([CXXFLAGS_VISIBILITY])
-  fi
-])

build/autoconf_prepend-include/autoconf/libs.m4

@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Checking for libraries.
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,8 +15,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02110-1301, USA.
+# 02111-1307, USA.
 
 # As a special exception, the Free Software Foundation gives unlimited
 # permission to copy, distribute and modify the configure scripts that
@@ -67,29 +67,24 @@
 # --------------------------------------------------------
 # Search for a library defining FUNC, if it's not already available.
 AC_DEFUN([AC_SEARCH_LIBS],
-[AS_VAR_PUSHDEF([ac_Search], [ac_cv_search_$1])dnl
+[AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
-AC_CACHE_CHECK([for library containing $1], [ac_Search],
 [ac_func_search_save_LIBS=$LIBS
-AC_LANG_CONFTEST([AC_LANG_CALL([], [$1])])
+ac_cv_search_$1=no
-for ac_lib in '' $2; do
+AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
-  if test -z "$ac_lib"; then
+	       [ac_cv_search_$1="none required"])
-    ac_res="none required"
+if test "$ac_cv_search_$1" = no; then
-  else
+  for ac_lib in $2; do
-    ac_res=-l$ac_lib
     LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
-  fi
+    AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
-  AC_LINK_IFELSE([], [AS_VAR_SET([ac_Search], [$ac_res])])
+		   [ac_cv_search_$1="-l$ac_lib"
-  AS_VAR_SET_IF([ac_Search], [break])dnl
+break])
-done
+  done
-AS_VAR_SET_IF([ac_Search], , [AS_VAR_SET([ac_Search], [no])])dnl
+fi
-rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS])
-ac_res=AS_VAR_GET([ac_Search])
+AS_IF([test "$ac_cv_search_$1" != no],
-AS_IF([test "$ac_res" != no],
+  [test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"
-  [test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   $3],
       [$4])dnl
-AS_VAR_POPDEF([ac_Search])dnl
 ])
 
 
@@ -123,14 +118,14 @@ AC_DEFUN([AC_CHECK_LIB],
 AS_LITERAL_IF([$1],
 	      [AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])],
 	      [AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1''_$2])])dnl
-AC_CACHE_CHECK([for $2 in -l$1], [ac_Lib],
+AC_CACHE_CHECK([for $2 in -l$1], ac_Lib,
 [ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$1 $5 $LIBS"
 AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
-	       [AS_VAR_SET([ac_Lib], [yes])],
+	       [AS_VAR_SET(ac_Lib, yes)],
-	       [AS_VAR_SET([ac_Lib], [no])])
+	       [AS_VAR_SET(ac_Lib, no)])
 LIBS=$ac_check_lib_save_LIBS])
-AS_IF([test AS_VAR_GET([ac_Lib]) = yes],
+AS_IF([test AS_VAR_GET(ac_Lib) = yes],
       [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
   LIBS="-l$1 $LIBS"
 ])],
@@ -142,8 +137,8 @@ AS_VAR_POPDEF([ac_Lib])dnl
 # AH_CHECK_LIB(LIBNAME)
 # ---------------------
 m4_define([AH_CHECK_LIB],
-[AH_TEMPLATE(AS_TR_CPP([HAVE_LIB$1]),
+[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1),
-	     [Define to 1 if you have the `$1' library (-l$1).])])
+	     [Define to 1 if you have the `]$1[' library (-l]$1[).])])
 
 
 # AC_HAVE_LIBRARY(LIBRARY,
@@ -185,27 +180,21 @@ m4_popdef([AC_Lib_Name])dnl
 # Internal subroutine of _AC_PATH_X.
 # Set ac_x_includes and/or ac_x_libraries.
 m4_define([_AC_PATH_X_XMKMF],
-[AC_ARG_VAR(XMKMF, [Path to xmkmf, Makefile generator for X Window System])dnl
+[rm -fr conftest.dir
-rm -f -r conftest.dir
 if mkdir conftest.dir; then
   cd conftest.dir
+  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
   cat >Imakefile <<'_ACEOF'
-incroot:
+acfindx:
-	@echo incroot='${INCROOT}'
+	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-usrlibdir:
-	@echo usrlibdir='${USRLIBDIR}'
-libdir:
-	@echo libdir='${LIBDIR}'
 _ACEOF
-  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    for ac_var in incroot usrlibdir libdir; do
+    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-    done
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
     for ac_extension in a so sl; do
-      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
+	 test -f $ac_im_libdir/libX11.$ac_extension; then
 	ac_im_usrlibdir=$ac_im_libdir; break
       fi
     done
@@ -213,7 +202,7 @@ _ACEOF
     # bogus both because they are the default anyway, and because
     # using them would break gcc on systems where it needs fixed includes.
     case $ac_im_incroot in
-	/usr/include) ac_x_includes= ;;
+	/usr/include) ;;
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
@@ -222,7 +211,7 @@ _ACEOF
     esac
   fi
   cd ..
-  rm -f -r conftest.dir
+  rm -fr conftest.dir
 fi
 ])# _AC_PATH_X_XMKMF
 
@@ -270,7 +259,7 @@ ac_x_header_dirs='
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Xlib.h.
+  # Guess where to find include files, by looking for a specified header file.
   # First, try using that file with no special directory specified.
   AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])],
 [# We can compile using X headers with no special include directory.
@@ -299,7 +288,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
   for ac_extension in a so sl; do
-    if test -r "$ac_dir/libX11.$ac_extension"; then
+    if test -r $ac_dir/libX11.$ac_extension; then
       ac_x_libraries=$ac_dir
       break 2
     fi
@@ -318,16 +307,14 @@ AC_DEFUN([_AC_PATH_X],
 ac_x_includes=no ac_x_libraries=no
 _AC_PATH_X_XMKMF
 _AC_PATH_X_DIRECT
-case $ac_x_includes,$ac_x_libraries in #(
+if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
-  no,* | *,no | *\'*)
+  # Didn't find X anywhere.  Cache the known absence of X.
-    # Didn't find X, or a directory has "'" in its name.
+  ac_cv_have_x="have_x=no"
-    ac_cv_have_x="have_x=no";; #(
+else
-  *)
+  # Record where we found X for the cache.
-    # Record where we found X for the cache.
+  ac_cv_have_x="have_x=yes \
-    ac_cv_have_x="have_x=yes\
+		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-	ac_x_includes='$ac_x_includes'\
+fi])dnl
-	ac_x_libraries='$ac_x_libraries'"
-esac])dnl
 ])
 
 
@@ -344,19 +331,23 @@ m4_divert_once([HELP_BEGIN], [
 X features:
   --x-includes=DIR    X include files are in DIR
   --x-libraries=DIR   X library files are in DIR])dnl
-AC_MSG_CHECKING([for X])
 
+if test "x$ac_path_x_has_been_run" != xyes; then
+  AC_MSG_CHECKING([for X])
+
+ac_path_x_has_been_run=yes
 AC_ARG_WITH(x, [  --with-x                use the X Window System])
 # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
 if test "x$with_x" = xno; then
   # The user explicitly disabled X.
   have_x=disabled
 else
-  case $x_includes,$x_libraries in #(
+  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-    *\'*) AC_MSG_ERROR([Cannot use X directory names containing ']);; #(
+    # Both variables are already set.
-    *,NONE | NONE,*) _AC_PATH_X;; #(
+    have_x=yes
-    *) have_x=yes;;
+  else
-  esac
+    _AC_PATH_X
+  fi
   eval "$ac_cv_have_x"
 fi # $with_x != no
 
@@ -368,12 +359,16 @@ else
   test "x$x_includes" = xNONE && x_includes=$ac_x_includes
   test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
   # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes\
+  ac_cv_have_x="have_x=yes \
-	ac_x_includes='$x_includes'\
+		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-	ac_x_libraries='$x_libraries'"
+  # It might be that x_includes is empty (headers are found in the
-  AC_MSG_RESULT([libraries $x_libraries, headers $x_includes])
+  # standard search path. Then output the corresponding message
+  ac_out_x_includes=$x_includes
+  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
+  AC_MSG_RESULT([libraries $x_libraries, headers $ac_out_x_includes])
 fi
-])# AC_PATH_X
+
+fi])# AC_PATH_X
 
 
 
@@ -395,22 +390,29 @@ else
   # It would also be nice to do this for all -L options, not just this one.
   if test -n "$x_libraries"; then
     X_LIBS="$X_LIBS -L$x_libraries"
+dnl FIXME: banish uname from this macro!
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .
-    AC_MSG_CHECKING([whether -R must be followed by a space])
+    case `(uname -sr) 2>/dev/null` in
-    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+    "SunOS 5"*)
-    ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag=$ac_[]_AC_LANG_ABBREV[]_werror_flag
+      AC_MSG_CHECKING([whether -R must be followed by a space])
-    ac_[]_AC_LANG_ABBREV[]_werror_flag=yes
+      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-    AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+      AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_nospace=yes, ac_R_nospace=no)
-      [AC_MSG_RESULT([no])
+      if test $ac_R_nospace = yes; then
-       X_LIBS="$X_LIBS -R$x_libraries"],
+	AC_MSG_RESULT([no])
-      [LIBS="$ac_xsave_LIBS -R $x_libraries"
+	X_LIBS="$X_LIBS -R$x_libraries"
-       AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+      else
-	 [AC_MSG_RESULT([yes])
+	LIBS="$ac_xsave_LIBS -R $x_libraries"
-	  X_LIBS="$X_LIBS -R $x_libraries"],
+	AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_space=yes, ac_R_space=no)
-	 [AC_MSG_RESULT([neither works])])])
+	if test $ac_R_space = yes; then
-    ac_[]_AC_LANG_ABBREV[]_werror_flag=$ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag
+	  AC_MSG_RESULT([yes])
-    LIBS=$ac_xsave_LIBS
+	  X_LIBS="$X_LIBS -R $x_libraries"
+	else
+	  AC_MSG_RESULT([neither works])
+	fi
+      fi
+      LIBS=$ac_xsave_LIBS
+    esac
   fi
 
   # Check for system-dependent libraries X programs must link with.

build/autogen.mk

@@ -58,8 +58,7 @@ ACLOCAL_SOURCES = \
   build/aclocal/gtk-2.0.m4 \
   build/aclocal/gtk.m4 \
   build/aclocal/pkg.m4 \
-  build/aclocal/sdl.m4 \
+  build/aclocal/sdl.m4
-  build/aclocal/visibility.m4
 
 # Run aclocal whenever acinclude or one of our local m4s is updated.
 aclocal.m4: configure.in acinclude.m4 $(ACLOCAL_SOURCES)

build/bakefiles/.cvsignore

@@ -0,0 +1,2 @@
+.bakefile_gen.state
+Bakefiles.local.bkgen

build/bakefiles/Bakefiles.bkgen

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!-- $Id$ -->
 
-<bakefile-gen>
+<bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
 
     <!--
     Formats listed here are not generated by default. To enable them, either
@@ -15,11 +15,17 @@
 
     Reasons why these formats are disabled (and so not in CVS):
 
+    cbuilderx - Generated projects are too bad to be included in CVS. Please
+                *do not* enable this format until FIXMEs in .bkl files related
+                to cbuilderx are addressed. In particular, the project must
+                be placed into build/msw(?) directory and store object files
+                in its subdirectory and it must copy setup.h as others do.
+    cbx_unix  - Doesn't integrate well and won't be used by most Unix people.
     dmars, dmars_smake, msevc4prj - These are generated at release time and
                 we don't want to clutter the source tree with these files.
     -->
 
-    <disable-formats>dmars,dmars_smake,msevc4prj</disable-formats>
+    <disable-formats>dmars,dmars_smake,msevc4prj,cbx_unix,cbuilderx</disable-formats>
 
 
     <!-- These wildcards match all .bkl files in wxWidgets tree: -->
@@ -44,26 +50,26 @@
 
     <!-- List of output formats to generate: -->
     <add-formats>
-        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom
+        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
     </add-formats>
 
     <del-formats files="../../samples/*.bkl">
-        autoconf,msvc6prj,msevc4prj,msvs2005prj
+        autoconf,msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../demos/*.bkl">
-        msvc6prj,msevc4prj,msvs2005prj
+        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">
-        msvc6prj,msevc4prj,msvs2005prj
+        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../samples/mobile/mobile_samples.bkl">
-        msvc6prj,msevc4prj,msvs2005prj
+        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">
-        msvc6prj,msevc4prj,msvs2005prj
+        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../utils/*.bkl">
-        msvc6prj,msevc4prj,msvs2005prj
+        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
     </del-formats>
 
     <!-- WinCE can't have console apps: -->
@@ -75,7 +81,7 @@
 
     <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
     <del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
-        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom
+        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom,cbuilderx,cbx_unix
     </del-formats>
 
 
@@ -114,9 +120,19 @@
     <add-flags files="wx.bkl" formats="msevc4prj">
         -o../wince/wx.vcw
     </add-flags>
+    <add-flags files="wx.bkl" formats="cbuilderx">
+        -o../../wx.cbx
+    </add-flags>
     <add-flags files="../../contrib/build/*/*.bkl" formats="autoconf">
         -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/Makefile.in
     </add-flags>
+    <add-flags files="../../contrib/build/*/*.bkl" formats="cbx_unix">
+        -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT)Unix.cbx
+    </add-flags>
+    <!-- FIXME: don't do this once it is possible (new CBX version) -->
+    <add-flags files="../../contrib/build/*/*.bkl" formats="cbuilderx">
+        -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
+    </add-flags>
     <add-flags files="../../contrib/build/*/*.bkl"
                formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj,msvs2005prj">
         -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)

build/bakefiles/build_cfg.bkl

@@ -8,7 +8,7 @@
     the library.
     -->
 
-    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2005prj'] and
+    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2005prj','cbuilderx'] and
               TOOLKIT in ['PM','MSW','MGL','MOTIF']">
 
         <set var="BUILD_CFG_FILE" make_var="1">

build/bakefiles/common.bkl

@@ -3,7 +3,7 @@
 
 <makefile>
 
-    <requires version="0.2.1"/>
+    <requires version="0.2.3"/>
 
     <!-- bakefile modules we need: -->
     <using module="datafiles"/>
@@ -155,9 +155,6 @@
     <set var="WXLIB_RICHTEXT">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
     </set>
-    <set var="WXLIB_STC">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
-    </set>
 
     <set var="WXLIB_MONO">
         <if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
@@ -183,13 +180,13 @@
         <set var="CFG_NAME_PART">
             $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
         </set>
-
-        <!-- NB: this is make_var so that it can be overriden on command line
-                 like this: nmake -f makefile.vc COMPILER_PREFIX=vc6 -->
-        <set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
-
         <set var="OBJS" make_var="1">
-            $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
+            <if cond="FORMAT!='cbuilderx'">
+                $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
+            </if>
+            <!-- FIXME: waiting for removal after CBX has better ../ dirs
+                 support -->
+            <if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
         </set>
 
         <set var="BUILDDIR">$(OBJS)</set>
@@ -205,7 +202,7 @@
     <set var="LIBDIRNAME" make_var="1">
         <if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>
         <if cond="FORMAT!='autoconf'">
-            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
         </if>
     </set>
 
@@ -264,6 +261,11 @@
         <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
         <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
     </set>
+    <set var="NDEBUG_DEFINE">
+        <if cond="FORMAT!='autoconf' and DEBUG_RUNTIME_LIBS=='default' and BUILD=='release'">NDEBUG</if>
+        <if cond="FORMAT!='autoconf' and DEBUG_RUNTIME_LIBS=='0'">NDEBUG</if>
+    </set>
+
     <!-- does not cover all cases, but better than nothing -->
     <set var="NO_VC_CRTDBG">
         <if cond="FORMAT=='msvc' and BUILD=='debug' and DEBUG_RUNTIME_LIBS=='0'">__NO_VC_CRTDBG__</if>
@@ -284,7 +286,15 @@
     <set var="UNICOWS_LIB">
         <if cond="MSLU=='1'">unicows</if>
     </set>
-
+    <set var="CAIRO_LIB">
+        <if cond="USE_CAIRO=='1'">cairo</if>
+    </set>
+    <set var="CAIRO_LIBDIR">
+        <if cond="USE_CAIRO=='1'">$(DOLLAR)(CAIRO_ROOT)/lib</if>
+    </set>
+    <set var="CAIRO_INCLUDEDIR">
+        <if cond="USE_CAIRO=='1'">$(DOLLAR)(CAIRO_ROOT)/include/cairo</if>
+    </set>
     <if cond="FORMAT!='autoconf'">
         <set var="GDIPLUS_LIB">
             <if cond="USE_GDIPLUS=='1'">gdiplus</if>
@@ -449,7 +459,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <include file="tiff.bkl"/>
     <include file="odbc.bkl"/>
     <include file="expat.bkl"/>
-    <include file="scintilla.bkl"/>
 
 
     <!-- =============================================================== -->
@@ -481,6 +490,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <define>__WX$(TOOLKIT)__</define>
         <define>$(WXUNIV_DEFINE)</define>
         <define>$(DEBUG_DEFINE)</define>
+        <define>$(NDEBUG_DEFINE)</define>
         <define>$(EXCEPTIONS_DEFINE)</define>
         <define>$(RTTI_DEFINE)</define>
         <define>$(THREAD_DEFINE)</define>
@@ -489,14 +499,13 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <if cond="FORMAT!='autoconf'"><define>$(GFXCTX_DEFINE)</define></if>
         <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
+        <include cond="FORMAT!='autoconf'">$(CAIRO_INCLUDEDIR)</include>
         <lib-path>$(LIBDIRNAME)</lib-path>
         <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
             <lib-path>$(MGLLIBPATH)</lib-path>
             <lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
         </if>
-
         <warnings>max</warnings>
-        <cxxflags cond="FORMAT=='autoconf'">$(CXXWARNINGS)</cxxflags>
         <cppflags-watcom>
             -wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
             -wcd=656 <!-- define this function inside its class definition (may improve code quality) -->
@@ -536,6 +545,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
             <sys-lib>$(UNICOWS_LIB)</sys-lib>
             <sys-lib>$(GDIPLUS_LIB)</sys-lib>
+            <sys-lib>$(CAIRO_LIB)</sys-lib>
+            <lib-path>$(CAIRO_LIBDIR)</lib-path>
             <if cond="FORMAT=='borland'">
                 <sys-lib>ole2w32</sys-lib>
             </if>
@@ -661,7 +672,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
         <depends>wxpng</depends>
-        <depends>wxscintilla</depends>
     </template>
 
     <template id="wx_3rdparty_dependencies"
@@ -676,7 +686,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
             <include>$(DOLLAR)(%SCITECH)/include</include>
         </if>
-        <include>$(INC_TIFF_BUILD)</include>
         <include>$(INC_TIFF)</include>
         <include>$(INC_JPEG)</include>
         <include>$(INC_PNG)</include>

build/bakefiles/config.bkl

@@ -49,7 +49,7 @@
     <option name="UNICODE">
         <values>0,1</values>
         <values-description>,Unicode</values-description>
-        <default-value>1</default-value>
+        <default-value>0</default-value>
         <description>
             Compile Unicode build of wxWidgets?
         </description>
@@ -213,14 +213,6 @@ Acts according to BUILD by default.
         </description>
     </option>
 
-    <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>
@@ -274,6 +266,14 @@ Acts according to BUILD by default.
         </description>
     </option>
 
+    <option name="USE_CAIRO">
+        <values>0,1</values>
+        <default-value>0</default-value>
+        <description>
+            Enable wxCairoContext for platforms other than Linux/GTK.
+        </description>
+    </option>
+
     <if cond="FORMAT!='autoconf'">
         <option name="USE_GDIPLUS">
             <values>0,1</values>
@@ -347,16 +347,18 @@ to run the tests, include CppUnit library here.
         <option name="EXTRALIBS"/>
         <option name="EXTRALIBS_XML"/>
         <option name="EXTRALIBS_HTML"/>
+        <option name="EXTRALIBS_MEDIA"/>
         <option name="EXTRALIBS_ODBC"/>
         <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="HEADER_PAD_OPTION"/>
+
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
@@ -399,6 +401,7 @@ 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_MEDIA"/>
         <set var="EXTRALIBS_ODBC"/>
         <set var="EXTRALIBS_GUI"/>
         <set var="EXTRALIBS_OPENGL">
@@ -411,10 +414,9 @@ it if SHARED=1 unless you know what you are doing.
 
         <set var="WITH_PLUGIN_SDL">0</set>
 
-        <set var="SRCDIR">
+        <if cond="BUILDING_LIB=='1'">
-            <if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
+            <set-srcdir>../..</set-srcdir>
-            <if cond="BUILDING_LIB=='0'">.</if>
+        </if>
-        </set>
         <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
     </if>
 
@@ -434,6 +436,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                  -->
@@ -444,7 +452,6 @@ Set the version of your Mingw installation here.
         <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_MEDIA">1</set>
         <set var="USE_XRC">1</set>
@@ -456,6 +463,7 @@ Set the version of your Mingw installation here.
         <set var="USE_EXCEPTIONS">1</set>
         <set var="USE_RTTI">1</set>
         <set var="USE_THREADS">1</set>
+        <set var="USE_CAIRO">0</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>
@@ -463,6 +471,19 @@ Set the version of your Mingw installation here.
     </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'">
@@ -470,7 +491,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="UNICODE">1</set>
+        <set var="UNICODE">0</set>
         <!-- Free version does not distribute OpenGL,
              in commercial distribution better use dmars_smake format -->
         <set var="USE_OPENGL">0</set>

build/bakefiles/files.bkl

@@ -54,33 +54,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                               UNIX                                     -->
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_UNIX_SRC" hints="files">
-    src/common/fdiodispatcher.cpp
-    src/common/selectdispatcher.cpp
-    src/unix/appunix.cpp
     src/unix/baseunix.cpp
     src/unix/dir.cpp
     src/unix/dlunix.cpp
-    src/unix/epolldispatcher.cpp
-    src/unix/evtloopunix.cpp
     src/unix/mimetype.cpp
     src/unix/snglinst.cpp
     src/unix/stackwalk.cpp
     src/unix/stdpaths.cpp
     src/unix/threadpsx.cpp
-    src/unix/timerunx.cpp
 </set>
 <set var="BASE_AND_GUI_UNIX_SRC" hints="files">
     src/unix/utilsunx.cpp
 </set>
 <set var="BASE_UNIX_HDR" hints="files">
-    wx/private/fdiodispatcher.h
-    wx/private/selectdispatcher.h
-    wx/unix/app.h
     wx/unix/apptbase.h
     wx/unix/apptrait.h
-    wx/unix/chkconf.h
     wx/unix/execute.h
-    wx/unix/evtloop.h
     wx/unix/mimetype.h
     wx/unix/pipe.h
     wx/unix/private.h
@@ -106,12 +95,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/stackwalk.cpp
     src/msw/stdpaths.cpp
     src/msw/thread.cpp
-    src/msw/timer.cpp
     src/msw/utils.cpp
     src/msw/utilsexc.cpp
 </set>
 <set var="BASE_AND_GUI_WIN32_SRC" hints="files">
-    src/msw/evtloop.cpp
     src/msw/main.cpp
     src/msw/mslu.cpp
     src/msw/volume.cpp
@@ -156,14 +143,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="BASE_COREFOUNDATION_SRC" hints="files">
     src/mac/corefoundation/cfstring.cpp
     src/mac/corefoundation/stdpaths_cf.cpp
-    src/mac/corefoundation/strconv_cf.cpp
     src/mac/corefoundation/utilsexc_base.cpp
 </set>
 <set var="BASE_COREFOUNDATION_HDR" hints="files">
+    wx/mac/corefoundation/cfdataref.h
+    wx/mac/corefoundation/cfref.h
     wx/mac/corefoundation/cfstring.h
     wx/mac/corefoundation/hid.h
     wx/mac/corefoundation/stdpaths.h
-    wx/mac/corefoundation/private/strconv_cf.h
 </set>
 
 <!-- Base files used by Carbon on OS X and CarbonLib (not true Classic) -->
@@ -212,26 +199,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- Base files used only by OS X builds (not CarbonLib or Classic)  -->
 <set var="BASE_MACOSX_WXMAC_SRC" hints="files">
     $(BASE_MAC_SRC)
-    src/common/fdiodispatcher.cpp
-    src/common/selectdispatcher.cpp
-    src/unix/appunix.cpp
     src/unix/baseunix.cpp
-    src/unix/evtloopunix.cpp
     src/unix/dlunix.cpp
     src/unix/snglinst.cpp
     src/unix/stdpaths.cpp
-    src/unix/timerunx.cpp
 </set>
 <set var="BASE_MACOSX_WXMAC_HDR" hints="files">
     $(BASE_MAC_HDR)
-    wx/private/fdiodispatcher.h
-    wx/private/selectdispatcher.h
-    wx/unix/app.h
     wx/unix/apptbase.h
     wx/unix/apptrait.h
-    wx/unix/chkconf.h
-    wx/unix/evtloop.h
-    wx/unix/pipe.h
     wx/unix/stdpaths.h
 </set>
 
@@ -252,6 +228,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="BASE_OS2_SRC" hints="files">
     src/os2/dir.cpp
     src/os2/mimetype.cpp
+    src/os2/snglinst.cpp
     src/os2/stdpaths.cpp
     src/os2/thread.cpp
     src/os2/utils.cpp
@@ -319,8 +296,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/arcall.cpp
     src/common/arcfind.cpp
     src/common/archive.cpp
-    src/common/arrstr.cpp
-    src/common/base64.cpp
     src/common/clntdata.cpp
     src/common/cmdline.cpp
     src/common/config.cpp
@@ -332,7 +307,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/dynlib.cpp
     src/common/dynload.cpp
     src/common/encconv.cpp
-    src/common/evtloopcmn.cpp
     src/common/extended.c
     src/common/ffile.cpp
     src/common/file.cpp
@@ -369,23 +343,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/strconv.cpp
     src/common/stream.cpp
     src/common/string.cpp
-    src/common/stringimpl.cpp
-    src/common/stringops.cpp
-    src/common/strvararg.cpp
     src/common/sysopt.cpp
     src/common/tarstrm.cpp
     src/common/textbuf.cpp
     src/common/textfile.cpp
-    src/common/timercmn.cpp
-    src/common/timerimpl.cpp
     src/common/tokenzr.cpp
     src/common/txtstrm.cpp
-    src/common/unichar.cpp
     src/common/uri.cpp
     src/common/variant.cpp
     src/common/wfstream.cpp
-    src/common/wxcrt.cpp
+    src/common/wxchar.cpp
-    src/common/wxprintf.cpp
     src/common/xti.cpp
     src/common/xtistrm.cpp
     src/common/zipstrm.cpp
@@ -404,12 +371,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/archive.h
     wx/arrimpl.cpp
     wx/arrstr.h
-    wx/atomic.h
-    wx/base64.h
     wx/beforestd.h
     wx/buffer.h
     wx/build.h
-    wx/chartype.h
     wx/chkconf.h
     wx/clntdata.h
     wx/cmdline.h
@@ -418,7 +382,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/convauto.h
     wx/containr.h
     wx/cpp.h
-    wx/crt.h
     wx/datetime.h
     wx/datstrm.h
     wx/dde.h
@@ -433,7 +396,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/event.h
     wx/except.h
     wx/features.h
-    wx/flags.h
     wx/ffile.h
     wx/file.h
     wx/fileconf.h
@@ -491,9 +453,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/strconv.h
     wx/stream.h
     wx/string.h
-    wx/stringimpl.h
-    wx/stringops.h
-    wx/strvararg.h
     wx/sysopt.h
     wx/tarstrm.h
     wx/textbuf.h
@@ -504,7 +463,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/tokenzr.h
     wx/txtstrm.h
     wx/types.h
-    wx/unichar.h
     wx/uri.h
     wx/utils.h
     wx/variant.h
@@ -514,9 +472,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wfstream.h
     wx/wx.h
     wx/wxchar.h
-    wx/wxcrt.h
-    wx/wxcrtbase.h
-    wx/wxcrtvararg.h
     wx/wxprec.h
     wx/xti.h
     wx/xtistrm.h
@@ -609,7 +564,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="GUI_CMN_SRC" hints="files">
-    src/common/accelcmn.cpp
     src/common/accesscmn.cpp
     src/common/anidecod.cpp
     src/common/appcmn.cpp
@@ -617,8 +571,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/artstd.cpp
     src/common/bmpbase.cpp
     src/common/bookctrl.cpp
-    src/common/btncmn.cpp
-    src/common/cairo.cpp
     src/common/choiccmn.cpp
     src/common/clipcmn.cpp
     src/common/clrpickercmn.cpp
@@ -634,7 +586,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/dcbase.cpp
     src/common/dcbufcmn.cpp
     src/common/dcgraph.cpp
-    src/common/dcsvg.cpp
     src/common/dlgcmn.cpp
     src/common/dndcmn.cpp
     src/common/dobjcmn.cpp
@@ -643,15 +594,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/dpycmn.cpp
     src/common/dseldlg.cpp
     src/common/effects.cpp
+    src/common/evtloopcmn.cpp
     src/common/fddlgcmn.cpp
-    src/common/filectrlcmn.cpp
     src/common/filepickercmn.cpp
     src/common/fontpickercmn.cpp
     src/common/fldlgcmn.cpp
     src/common/fontcmn.cpp
     src/common/fontenumcmn.cpp
     src/common/fontmap.cpp
-    src/common/fontutilcmn.cpp
     src/common/framecmn.cpp
     src/common/gaugecmn.cpp
     src/common/gbsizer.cpp
@@ -693,11 +643,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/sizer.cpp
     src/common/srchcmn.cpp
     src/common/statbar.cpp
-    src/common/stattextcmn.cpp
     src/common/stockitem.cpp
     src/common/tbarbase.cpp
     src/common/textcmn.cpp
-    src/common/textentrycmn.cpp
+    src/common/timercmn.cpp
     src/common/toplvcmn.cpp
     src/common/treebase.cpp
     src/common/valgen.cpp
@@ -715,9 +664,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/dcpsg.cpp
     src/generic/dirctrlg.cpp
     src/generic/dragimgg.cpp
-    src/generic/filectrlg.cpp
     src/generic/filepickerg.cpp
     src/generic/fontpickerg.cpp
+    src/generic/graphicc.cpp
     src/generic/listbkg.cpp
     src/generic/logg.cpp
     src/generic/numdlgg.cpp
@@ -742,7 +691,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/bmpbuttn.h
     wx/brush.h
     wx/button.h
-    wx/cairo.h
     wx/checkbox.h
     wx/checklst.h
     wx/choicdlg.h
@@ -760,7 +708,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dcmemory.h
     wx/dcprint.h
     wx/dcscreen.h
-    wx/dcsvg.h
     wx/dialog.h
     wx/dirdlg.h
     wx/dragimag.h
@@ -780,7 +727,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/dcpsg.h
     wx/generic/dirctrlg.h
     wx/generic/dragimgg.h
-    wx/generic/filectrlg.h
     wx/generic/filedlgg.h
     wx/generic/filepickerg.h
     wx/generic/fontdlgg.h
@@ -798,6 +744,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/splitter.h
     wx/generic/srchctlg.h
     wx/generic/textdlgg.h
+    wx/generic/timer.h
     wx/generic/treectlg.h
     wx/graphics.h
     wx/helphtml.h
@@ -812,7 +759,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/palette.h
     wx/panel.h
     wx/pen.h
-    wx/position.h
     wx/radiobox.h
     wx/radiobut.h
     wx/renderer.h
@@ -829,7 +775,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/statusbr.h
     wx/textctrl.h
     wx/textdlg.h
-    wx/textentry.h
     wx/toolbar.h
     wx/validate.h
     wx/valtext.h
@@ -865,7 +810,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/effects.h
     wx/evtloop.h
     wx/fdrepdlg.h
-    wx/filectrl.h
     wx/filepicker.h
     wx/fontpicker.h
     wx/fmappriv.h
@@ -876,6 +820,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gdiobj.h
     wx/geometry.h
     wx/gifdecod.h
+    wx/glcanvas.h
     wx/help.h
     wx/helpbase.h
     wx/helpwin.h
@@ -899,7 +844,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/menuitem.h
     wx/metafile.h
     wx/minifram.h
-    wx/nonownedwnd.h
     wx/notebook.h
     wx/ownerdrw.h
     wx/paper.h
@@ -976,6 +920,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/clipbrd.cpp
     src/gtk/colour.cpp
     src/gtk/cursor.cpp
+    src/gtk/data.cpp
     src/gtk/dataobj.cpp
     src/gtk/dc.cpp
     src/gtk/dcclient.cpp
@@ -983,9 +928,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/dcscreen.cpp
     src/gtk/dnd.cpp
     src/gtk/evtloop.cpp
-    src/gtk/filectrl.cpp
     src/gtk/font.cpp
     src/gtk/gsockgtk.cpp
+    src/gtk/main.cpp
     src/gtk/minifram.cpp
     src/gtk/pen.cpp
     src/gtk/popupwin.cpp
@@ -1023,6 +968,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/pen.h
     wx/gtk/popupwin.h
     wx/gtk/region.h
+    wx/gtk/timer.h
     wx/gtk/tooltip.h
     wx/gtk/toplevel.h
     wx/gtk/win_gtk.h
@@ -1035,7 +981,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/filedlgg.cpp
-    src/generic/graphicc.cpp
     src/generic/listctrl.cpp
     src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp
@@ -1065,7 +1010,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/gauge.cpp
     src/gtk/gnome/gprint.cpp
     src/gtk/gnome/gvfs.cpp
-    src/gtk/print.cpp
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.cpp
@@ -1084,9 +1028,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/stattext.cpp
     src/gtk/tbargtk.cpp
     src/gtk/textctrl.cpp
-    src/gtk/textentry.cpp
     src/gtk/tglbtn.cpp
     src/gtk/treeentry_gtk.c
+    src/gtk/utilsres.cpp
 </set>
 <set var="GTK_HDR" hints="files">
     wx/generic/colrdlgg.h
@@ -1100,7 +1044,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/button.h
     wx/gtk/checkbox.h
     wx/gtk/checklst.h
-    wx/gtk/chkconf.h
     wx/gtk/collpane.h
     wx/gtk/colordlg.h
     wx/gtk/choice.h
@@ -1109,7 +1052,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/clrpicker.h
     wx/gtk/dialog.h
     wx/gtk/dirdlg.h
-    wx/gtk/filectrl.h
     wx/gtk/filedlg.h
     wx/gtk/fontpicker.h
     wx/gtk/filepicker.h
@@ -1118,7 +1060,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/gauge.h
     wx/gtk/gnome/gprint.h
     wx/gtk/gnome/gvfs.h
-    wx/gtk/print.h
     wx/gtk/listbox.h
     wx/gtk/mdi.h
     wx/gtk/menu.h
@@ -1138,7 +1079,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/stattext.h
     wx/gtk/tbargtk.h
     wx/gtk/textctrl.h
-    wx/gtk/textentry.h
     wx/gtk/tglbtn.h
     wx/gtk/treectrl.h
     wx/gtk/treeentry_gtk.h
@@ -1206,6 +1146,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk1/pen.h
     wx/gtk1/popupwin.h
     wx/gtk1/region.h
+    wx/gtk1/timer.h
     wx/gtk1/tooltip.h
     wx/gtk1/toplevel.h
     wx/gtk1/win_gtk.h
@@ -1256,6 +1197,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk1/tbargtk.cpp
     src/gtk1/textctrl.cpp
     src/gtk1/tglbtn.cpp
+    src/gtk1/utilsres.cpp
 </set>
 <set var="GTK1_HDR" hints="files">
     wx/generic/colrdlgg.h
@@ -1388,7 +1330,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="MOTIF_HDR" hints="files">
     wx/generic/colrdlgg.h
-    wx/generic/ctrlsub.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
@@ -1411,7 +1352,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/colour.h
     wx/motif/combobox.h
     wx/motif/control.h
-    wx/motif/ctrlsub.h
     wx/motif/cursor.h
     wx/motif/dataform.h
     wx/motif/dataobj.h
@@ -1448,6 +1388,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/stattext.h
     wx/motif/textctrl.h
     wx/motif/tglbtn.h
+    wx/motif/timer.h
     wx/motif/toolbar.h
     wx/motif/toplevel.h
     wx/motif/window.h
@@ -1461,7 +1402,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="X11_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
-    src/common/gsocketiohandler.cpp
+    src/common/socketevtdispatch.cpp
     src/generic/icon.cpp
     src/generic/timer.cpp
     src/x11/app.cpp
@@ -1549,12 +1490,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/dib.cpp
     src/msw/display.cpp
     src/msw/enhmeta.cpp
+    src/msw/evtloop.cpp
     src/msw/font.cpp
     src/msw/fontenum.cpp
     src/msw/fontutil.cpp
     src/msw/gdiimage.cpp
     src/msw/gdiobj.cpp
-    src/msw/gdiplus.cpp
     src/msw/graphics.cpp
     src/msw/gsockmsw.cpp
     src/msw/icon.cpp
@@ -1572,6 +1513,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/region.cpp
     src/msw/renderer.cpp
     src/msw/settings.cpp
+    src/msw/timer.cpp
     src/msw/tooltip.cpp
     src/msw/toplevel.cpp
     src/msw/utilsgui.cpp
@@ -1641,7 +1583,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/tabctrl.cpp
     src/msw/tbar95.cpp
     src/msw/textctrl.cpp
-    src/msw/textentry.cpp
     src/msw/tglbtn.cpp
     src/msw/treectrl.cpp
 </set>
@@ -1664,7 +1605,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/combo.h
     wx/msw/combobox.h
     wx/msw/control.h
-    wx/msw/ctrlsub.h
     wx/msw/cursor.h
     wx/msw/dc.h
     wx/msw/dcclient.h
@@ -1724,8 +1664,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/tabctrl.h
     wx/msw/tbar95.h
     wx/msw/textctrl.h
-    wx/msw/textentry.h
     wx/msw/tglbtn.h
+    wx/msw/timer.h
     wx/msw/tooltip.h
     wx/msw/toplevel.h
     wx/msw/treectrl.h
@@ -1853,6 +1793,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/icon.h
     wx/generic/imaglist.h
     wx/generic/mask.h
+    wx/generic/timer.h
     wx/mgl/app.h
     wx/mgl/bitmap.h
     wx/mgl/brush.h
@@ -1880,7 +1821,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="DFB_LOWLEVEL_SRC" hints="files">
     src/common/fontmgrcmn.cpp
-    src/common/gsocketiohandler.cpp
+    src/common/socketevtdispatch.cpp
     src/generic/caret.cpp
     src/generic/colour.cpp
     src/generic/icon.cpp
@@ -1900,7 +1841,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/dfb/font.cpp
     src/dfb/fontenum.cpp
     src/dfb/fontmgr.cpp
-    src/dfb/nonownedwnd.cpp
     src/dfb/overlay.cpp
     src/dfb/pen.cpp
     src/dfb/region.cpp
@@ -1916,6 +1856,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/icon.h
     wx/generic/imaglist.h
     wx/generic/mask.h
+    wx/generic/timer.h
     wx/dfb/app.h
     wx/dfb/bitmap.h
     wx/dfb/brush.h
@@ -1928,9 +1869,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dfb/dfbptr.h
     wx/dfb/evtloop.h
     wx/dfb/font.h
-    wx/dfb/nonownedwnd.h
     wx/dfb/pen.h
-    wx/dfb/popupwin.h
     wx/dfb/private.h
     wx/dfb/region.h
     wx/dfb/toplevel.h
@@ -2100,6 +2039,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/tabctrl.h
     wx/os2/textctrl.h
     wx/os2/tglbtn.h
+    wx/os2/timer.h
     wx/os2/toolbar.h
     wx/os2/tooltip.h
     wx/os2/toplevel.h
@@ -2114,12 +2054,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
     <!-- Shared wxMac and wxCocoa files -->
+    src/mac/common/glgrab.c
     src/mac/corefoundation/gsockosx.cpp
     src/mac/corefoundation/hid.cpp
     src/mac/corefoundation/utilsexc_cf.cpp
 </set>
 
 <set var="MAC_OSX_LOWLEVEL_HDR" hints="files">
+    wx/mac/common/glgrab.h
 </set>
 
 <set var="MAC_LOWLEVEL_SRC" hints="files">
@@ -2136,6 +2078,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- Native color/font dialogs -->
     src/mac/carbon/fontdlgosx.mm
     src/mac/carbon/colordlgosx.mm
+    <!-- cocoa bridge -->
+    src/mac/carbon/utilscocoa.mm
 </if>
 </set>
 
@@ -2143,7 +2087,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/accel.cpp
     src/mac/carbon/aga.cpp
     src/mac/carbon/app.cpp
-    src/mac/carbon/artmac.cpp
     src/mac/carbon/bitmap.cpp
     src/mac/carbon/bmpbuttn.cpp
     src/mac/carbon/brush.cpp
@@ -2264,6 +2207,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/fontdlg.h
     wx/mac/frame.h
     wx/mac/gauge.h
+    wx/mac/glcanvas.h
     wx/mac/gsockmac.h
     wx/mac/helpxxxx.h
     wx/mac/icon.h
@@ -2305,6 +2249,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/tabctrl.h
     wx/mac/taskbarosx.h
     wx/mac/textctrl.h
+    wx/mac/timer.h
     wx/mac/tglbtn.h
     wx/mac/toolbar.h
     wx/mac/tooltip.h
@@ -2390,6 +2335,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/statusbr.h
     wx/mac/carbon/tabctrl.h
     wx/mac/carbon/textctrl.h
+    wx/mac/carbon/timer.h
     wx/mac/carbon/tglbtn.h
     wx/mac/carbon/toolbar.h
     wx/mac/carbon/tooltip.h
@@ -2579,6 +2525,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/statline.h
     wx/cocoa/stattext.h
     wx/cocoa/textctrl.h
+    wx/cocoa/timer.h
     wx/cocoa/toolbar.h
     wx/cocoa/tooltip.h
     wx/cocoa/toplevel.h
@@ -2662,7 +2609,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="UNIV_HDR" hints="files">
     wx/generic/accel.h
-    wx/generic/ctrlsub.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
@@ -2719,19 +2665,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="ADVANCED_CMN_SRC" hints="files">
     src/common/animatecmn.cpp
     src/common/datavcmn.cpp
-    src/common/hyperlnkcmn.cpp
     src/generic/aboutdlgg.cpp
     src/generic/animateg.cpp
     src/generic/bmpcboxg.cpp
     src/generic/calctrl.cpp
     src/generic/datavgen.cpp
     src/generic/datectlg.cpp
-    src/generic/editlbox.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
     src/generic/helpext.cpp
-    src/generic/hyperlinkg.cpp
+    src/generic/hyperlink.cpp
     src/generic/laywin.cpp
     src/generic/odcombo.cpp
     src/generic/propdlg.cpp
@@ -2742,15 +2686,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="ADVANCED_CMN_HDR" hints="files">
-    wx/aboutdlg.h
     wx/animate.h
     wx/animdecod.h
     wx/bmpcbox.h
     wx/calctrl.h
     wx/dataview.h
+    wx/datectrl.h
     wx/dateevt.h
     wx/dcbuffer.h
-    wx/editlbox.h
+    wx/aboutdlg.h
     wx/generic/aboutdlgg.h
     wx/generic/animate.h
     wx/generic/bmpcbox.h
@@ -2761,7 +2705,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/gridctrl.h
     wx/generic/gridsel.h
     wx/generic/helpext.h
-    wx/generic/hyperlink.h
     wx/generic/laywin.h
     wx/generic/propdlg.h
     wx/generic/sashwin.h
@@ -2778,14 +2721,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/splash.h
     wx/taskbar.h
     wx/tipdlg.h
+    wx/wave.h
     wx/wizard.h
 </set>
 
-<set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
-    wx/datectrl.h
-    wx/dataview.h
-</set>
-
 <set var="ADVANCED_MSW_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/msw/aboutdlg.cpp
@@ -2817,16 +2756,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/taskbarcmn.cpp
     src/mac/carbon/aboutdlg.cpp
     src/mac/carbon/drawer.cpp
-    src/mac/carbon/dataview.cpp
-    src/mac/carbon/databrow.cpp
     src/mac/carbon/sound.cpp
     src/mac/carbon/taskbar.cpp
     src/mac/corefoundation/hidjoystick.cpp
 </set>
 <set var="ADVANCED_MAC_HDR" hints="files">
     wx/mac/carbon/drawer.h
-    wx/mac/carbon/dataview.h
-    wx/mac/carbon/databrow.h
     wx/mac/carbon/sound.h
     wx/mac/carbon/taskbarosx.h
     wx/mac/corefoundation/joystick.h
@@ -2867,13 +2802,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/aboutdlg.cpp
     src/gtk/animate.cpp
     src/gtk/dataview.cpp
-    src/gtk/hyperlink.cpp
     src/gtk/taskbar.cpp
     src/gtk/eggtrayicon.c
 </set>
 <set var="ADVANCED_GTK_HDR" hints="files">
     wx/gtk/animate.h
-    wx/gtk/hyperlink.h
 </set>
 
 <set var="ADVANCED_GTK1_SRC" hints="files">
@@ -3057,7 +2990,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/xrc/xh_slidr.cpp
     src/xrc/xh_spin.cpp
     src/xrc/xh_split.cpp
-    src/xrc/xh_srchctrl.cpp
     src/xrc/xh_statbar.cpp
     src/xrc/xh_stbmp.cpp
     src/xrc/xh_stbox.cpp
@@ -3118,7 +3050,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xrc/xh_slidr.h
     wx/xrc/xh_spin.h
     wx/xrc/xh_split.h
-    wx/xrc/xh_srchctrl.h
     wx/xrc/xh_statbar.h
     wx/xrc/xh_stbmp.h
     wx/xrc/xh_stbox.h
@@ -3155,51 +3086,30 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                             OpenGL canvas                              -->
 <!-- ====================================================================== -->
 
-<set var="OPENGL_SRC_PLATFORM" hints="files">
+<set var="OPENGL_SRC" hints="files">
-    src/common/glcmn.cpp
     <if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
     <if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">src/gtk/glcanvas.cpp</if>
-        src/gtk/glcanvas.cpp
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">src/gtk1/glcanvas.cpp</if>
-        src/unix/glx11.cpp
-    </if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">
-        src/gtk1/glcanvas.cpp
-        src/unix/glx11.cpp
-    </if>
     <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
-    <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
+    <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
-    <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
+    <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
     <if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
 </set>
 
-<set var="OPENGL_SRC" hints="files">
+<set var="OPENGL_HDR" hints="files">
-    src/common/glcmn.cpp
+    <if cond="TOOLKIT=='MAC'">wx/mac/carbon/glcanvas.h</if>
-    $(OPENGL_SRC_PLATFORM)
-</set>
-
-<set var="OPENGL_HDR_PLATFORM" hints="files">
-    <if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h wx/mac/carbon/glcanvas.h</if>
     <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">wx/gtk/glcanvas.h</if>
-        wx/gtk/glcanvas.h
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">wx/gtk1/glcanvas.h</if>
-        wx/unix/glx11.h
-    </if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">
-        wx/gtk1/glcanvas.h
-        wx/unix/glx11.h
-    </if>
     <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='WINCE'">wx/msw/glcanvas.h</if>
-    <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
+    <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</if>
-    <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
+    <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
+    <if cond="TOOLKIT=='PM'">wx/os2/glcanvas.h</if>
 </set>
 
-<set var="OPENGL_HDR" hints="files">
-    wx/glcanvas.h
-    $(OPENGL_HDR_PLATFORM)
-</set>
 
 
 <!-- ====================================================================== -->
@@ -3242,6 +3152,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/aui/floatpane.cpp
     src/aui/auibook.cpp
     src/aui/tabmdi.cpp
+    src/aui/auibar.cpp
 </set>
 <set var="AUI_HDR" hints="files">
     wx/aui/framemanager.h
@@ -3249,6 +3160,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/aui/floatpane.h
     wx/aui/auibook.h
     wx/aui/tabmdi.h
+    wx/aui/auibar.h
     wx/aui/aui.h
 </set>
 
@@ -3279,21 +3191,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/richtext/richtextprint.h
 </set>
 
-
-<!-- ====================================================================== -->
-<!--                                wxSTC                                   -->
-<!-- ====================================================================== -->
-
-<set var="STC_SRC" hints="files">
-    src/stc/stc.cpp
-    src/stc/PlatWX.cpp
-    src/stc/ScintillaWX.cpp
-</set>
-
-<set var="STC_HDR" hints="files">
-    wx/stc/stc.h
-</set>
-
 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
@@ -3489,7 +3386,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</if>
     </set>
     <set var="ADVANCED_HDR" hints="files">
-        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_CMN_NATIVE_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
+        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
         <if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</if>
     </set>
 
@@ -3530,7 +3427,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
             $(OPENGL_HDR) $(QA_HDR) $(DBGRID_HDR) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)
-            $(STC_HDR)
         </if>
     </set>
 

build/bakefiles/formats/FORMATS.bkmanifest

@@ -1,6 +1,13 @@
 <?xml version="1.0" ?>
 
-<bakefile-manifest>
+<bakefile-manifest xmlns="http://www.bakefile.org/schema/bakefile-formats">
+
+    <format id="wx24dsp">
+        <description>
+            src/wxWindows.dsp which makes same files as 2.4 version
+        </description>
+        <default-filename>wxWindows.dsp</default-filename>
+    </format>
     
     <format id="rpmspec">
         <description>
@@ -8,5 +15,14 @@
         </description>
         <default-filename>xxx.spec</default-filename>
     </format>
+
+    <format id="cbx_unix">
+        <description>
+            C++BuilderX projects for Unix (use configure)
+        </description>
+        <default-filename>
+            $(os.path.splitext(os.path.basename(INPUT_FILE))[0])Unix.cbx
+        </default-filename>
+    </format>
     
 </bakefile-manifest>

build/bakefiles/formats/README

@@ -1,4 +1,6 @@
 
 This directory contains misc Bakefile backends that are wxWidgets-specific:
 
+wx24dsp     - generates wx2.4-compatible VC++ project file (src/wxWindows.dsp)
 rpmspec     - generates part of .spec files with list of wxBase headers
+cbx_unix    - Borland C++BuilderX project files for configure-based build

build/bakefiles/formats/cbx_unix.bkl

@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+
+<makefile>
+    
+    <include file="presets/fake.bkl"/>
+    <set var="COMPILER">vc</set>
+
+
+    <define-tag name="__fake_hook" rules="__fake">
+        <set var="type" overwrite="0">fake</set>
+    </define-tag>
+    
+    <define-tag name="__fake_hook" rules="exe">
+        <set var="type">exe</set>
+    </define-tag>
+
+    <output file="$(OUTPUT_FILE)" writer="cbx_unix.empy"/>
+    <set var="FORMAT_OUTPUT_VARIABLES">type</set>
+ 
+</makefile>

build/bakefiles/formats/cbx_unix.empy

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--C++BuilderX Project-->
+<project>
+  <property category="build.config" name="active" value="0"/>
+  <property category="build.config" name="count" value="1"/>
+  <property category="build.config" name="excludedefaultforzero" value="0"/>
+  <property category="build.config.0" name="builddir" value="Debug"/>
+  <property category="build.config.0" name="key" value="Debug_Build"/>
+  <property category="build.config.0" name="name" value="Debug Build"/>
+  <property category="build.config.0" name="settings.MinGW" value="default;debug"/>
+  <property category="build.config.0" name="settings.gnuc++" value="default;debug"/>
+  <property category="build.config.0" name="settings.intellinia32" value="default;debug"/>
+  <property category="build.config.0" name="settings.mswin32" value="default;debug"/>
+  <property category="build.config.0" name="type" value="Toolset"/>
+  <property category="build.config.1" name="key" value="Release_Build"/>
+  <property category="build.config.1" name="name" value="Release Build"/>
+  <property category="build.config.1" name="settings.MinGW" value="default;release"/>
+  <property category="build.config.1" name="settings.gnuc++" value="default;release"/>
+  <property category="build.config.1" name="settings.intellinia32" value="default;release"/>
+  <property category="build.config.1" name="settings.mswin32" value="default;release"/>
+  <property category="build.config.1" name="type" value="Toolset"/>
+  <property category="build.node" name="type" value="CBMakefileProjectType"/>
+  <property category="build.platform" name="active" value="linux"/>
+  <property category="build.platform" name="linux.Debug_Build.toolset" value="gnuc++"/>
+  <property category="build.platform" name="linux.Release_Build.toolset" value="gnuc++"/>
+  <property category="build.platform" name="linux.default" value="gnuc++"/>
+  <property category="build.platform" name="linux.gnuc++.enabled" value="1"/>
+  <property category="build.platform" name="linux.mswin32.enabled" value="0"/>
+  <property category="build.platform" name="linux.win32b.enabled" value="0"/>
+  <property category="build.platform" name="solaris.default" value="gnuc++"/>
+  <property category="build.platform" name="solaris.enabled" value="0"/>
+  <property category="build.platform" name="win32.default" value="MinGW"/>
+  <property category="build.platform" name="win32.enabled" value="0"/>
+  <property category="cbproject" name="lastnodeid" value="4"/>
+  <property category="cbproject" name="version" value="X.1.0"/>
+  <property category="classbrowser" name="enable" value="0"/>
+  <property category="classbrowser" name="parser.cpp.skip_standard_directories" value="1"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.arg.1" value="/usr/include"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.arg.2" value="/usr/include/g++-3"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.enabled" value="1"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.MD.enabled" value="1"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.O0.enabled" value="1"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.c.enabled" value="1"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.g.arg" value="2"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.g.enabled" value="1"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.o.enabled" value="1"/>
+  <property category="linux.Debug_Build.gnuc++.g++link" name="option.o.enabled" value="1"/>
+  <property category="linux.gnuc++.Debug_Build" name="saved" value="1"/>
+  <property category="makefileproject" name="makefile.ID.1" value="1"/>
+  <property category="makefileproject" name="makefile.list.1" value="Makefile"/>
+  <property category="makefiletarget" name="makefile.1.params" value="-f Makefile"/>
+  <property category="makefiletarget" name="makefile.1.target.list.1" value="all"/>
+  <property category="makefiletarget" name="makefile.1.target.list.2" value="clean"/>
+  <property category="runtime" name="ConfigurationCount" value="@(len([t for t in targets if t.type=='exe'])-1)"/>
+@{
+ALL_EXES = [x for x in targets if x.type=='exe']
+if len(ALL_EXES) == 1:
+    DEFAULT_EXE = 0
+else:
+    DEFAULT_EXE = -1
+}@
+  <property category="runtime" name="DefaultConfiguration" value="@DEFAULT_EXE"/>
+@[for i in range(0,len(ALL_EXES))]@
+  <property category="runtime.@i" name="BuildTargetOnRun" value="com.borland.cbuilder.build.CBProjectBuilder$ProjectBuildAction;make"/>
+  <property category="runtime.@i" name="ConfigurationName" value="@ALL_EXES[i].id"/>
+  <property category="runtime.@i" name="RunnableType" value="com.borland.cbuilder.runtime.ExecutableRunner"/>
+  <property category="runtime.@i" name="native.exec.path" value="./@ALL_EXES[i].id"/>
+  <property category="runtime.@i" name="native.startdir.path" value="."/>
+  <property category="runtime.@i" name="native.target.override" value="1"/>
+@[end for]@
+  <property category="unique" name="id" value="4"/>
+  <node name="console" type="NavigationDirectory">
+    <property category="directorynode" name="showSubdirectories" value="1"/>
+    <property category="directorynode" name="url" value="."/>
+    <property category="unique" name="id" value="1"/>
+  </node>
+</project>

build/bakefiles/formats/rpmspec.bkl

@@ -4,6 +4,8 @@
 <makefile>
 
     <include file="presets/fake.bkl"/>
+
+    <set var="EOL_STYLE">unix</set>
     <set var="COMPILER">gcc</set>
 
     <!-- fake.bkl defaults to win32 platform -->

build/bakefiles/mac_bundles.bkl

@@ -31,8 +31,9 @@
             <if cond="TOOLKIT=='MAC'">$(BUNDLE)/PkgInfo</if>
             <if cond="TOOLKIT=='COCOA'">$(BUNDLE)/PkgInfo</if>
         </set>
-        
+
-        <add-target target="$(BUNDLE_TGT)" type="action"/>
+        <add-target target="$(BUNDLE_TGT)" type="action"
+                    cond="target and PLATFORM_MACOSX=='1'"/>
         <modify-target target="$(BUNDLE_TGT)">
             <!-- required data: -->
             <depends>$(id)</depends>
@@ -64,7 +65,7 @@
         
         <!-- add pseudo target id_bundle: -->
         <add-target target="$(id)_bundle" type="phony"
-                    cond="PLATFORM_MACOSX=='1'"/>
+                    cond="target and PLATFORM_MACOSX=='1'"/>
         <modify-target target="$(id)_bundle">
             <dependency-of>all</dependency-of>
             <depends>$(BUNDLE_TGT_REF)</depends>

build/bakefiles/make_dist.mk

@@ -15,7 +15,6 @@ COMMDIR  = $(WXDIR)/src/common
 HTMLDIR  = $(WXDIR)/src/html
 RICHTEXTDIR = $(WXDIR)/src/richtext
 AUIDIR =   $(WXDIR)/src/aui
-STCDIR =   $(WXDIR)/src/stc
 UNIXDIR  = $(WXDIR)/src/unix
 PNGDIR   = $(WXDIR)/src/png
 JPEGDIR  = $(WXDIR)/src/jpeg
@@ -167,7 +166,6 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/html
 	mkdir $(DISTDIR)/include/wx/richtext
 	mkdir $(DISTDIR)/include/wx/aui
-	mkdir $(DISTDIR)/include/wx/stc
 	mkdir $(DISTDIR)/include/wx/protocol
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/include/wx/xml
@@ -178,7 +176,6 @@ ALL_GUI_DIST: ALL_DIST
 	$(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
 	$(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext
 	$(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui
-	$(CP_P) $(INCDIR)/wx/stc/*.h $(DISTDIR)/include/wx/stc
 	$(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
 	$(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
 	$(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
@@ -193,7 +190,6 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/src/html
 	mkdir $(DISTDIR)/src/richtext
 	mkdir $(DISTDIR)/src/aui
-	mkdir $(DISTDIR)/src/stc
 	mkdir $(DISTDIR)/src/$(TOOLKITDIR)
 	mkdir $(DISTDIR)/src/png
 	mkdir $(DISTDIR)/src/jpeg
@@ -212,7 +208,6 @@ ALL_GUI_DIST: ALL_DIST
 	$(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
 	$(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext
 	$(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
-	$(CP_P) $(STCDIR)/*.cpp $(DISTDIR)/src/stc
 	$(CP_P) $(PNGDIR)/*.h $(DISTDIR)/src/png
 	$(CP_P) $(PNGDIR)/*.c $(DISTDIR)/src/png
 	$(CP_P) $(PNGDIR)/README $(DISTDIR)/src/png
@@ -240,7 +235,6 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/include/wx/html
 	mkdir $(DISTDIR)/include/wx/richtext
 	mkdir $(DISTDIR)/include/wx/aui
-	mkdir $(DISTDIR)/include/wx/stc
 	mkdir $(DISTDIR)/include/wx/mac
 	mkdir $(DISTDIR)/include/wx/mac/carbon
 	mkdir $(DISTDIR)/include/wx/mac/corefoundation
@@ -257,6 +251,7 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/src/palmos
 	$(CP_P) $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
 	$(CP_P) $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
+	$(CP_P) $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
 	list='$(ALL_PORTS_BASE_HEADERS)'; for p in $$list; do \
 	  $(CP_P) $(WXDIR)/include/$$p $(DISTDIR)/include/$$p; \
 	done

build/bakefiles/monolithic.bkl

@@ -5,7 +5,7 @@
     <set var="MONOLIB_GUI_SRC">
         <if cond="USE_GUI=='1'">
             $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
-            $(DBGRID_SRC) $(XRC_SRC) $(AUI_SRC) $(RICHTEXT_SRC) $(STC_SRC)
+            $(DBGRID_SRC) $(XRC_SRC) $(AUI_SRC) $(RICHTEXT_SRC)
         </if>
     </set>
     <set var="MONOLIB_SRC">
@@ -19,16 +19,10 @@
         <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>
         <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
+        <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
         <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
         <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
-	<!-- STC stuff, should this be conditionalized? -->
-        <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
-        <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
-        <define>__WX__</define>
-        <define>SCI_LEXER</define>
-        <define>LINK_LEXERS</define>
-        <library>$(wxscintilla_library_link)</library>
     </dll>
 
     <lib id="monolib" template="wx_lib"
@@ -39,12 +33,6 @@
         <if cond="FORMAT=='watcom'">
             <set var="LIB_PAGESIZE" overwrite="1">8192</set>
         </if>
-	<!-- STC stuff, should this be conditionalized? -->
-        <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
-        <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
-        <define>__WX__</define>
-        <define>SCI_LEXER</define>
-        <define>LINK_LEXERS</define>
     </lib>
 
 

build/bakefiles/multilib.bkl

@@ -3,20 +3,6 @@
 
 <makefile>
 
-    <define-rule name="wxshortcut" extends="phony">
-        <template>
-            <set var="name">$(id.replace('wx',''))</set>
-            <set var="namedll">
-                <if cond="SHARED=='1'">$(name)dll</if>
-            </set>
-            <set var="namelib">
-                <if cond="SHARED=='0'">$(name)lib</if>
-            </set>
-            <depends>$(namedll)</depends>
-            <depends>$(namelib)</depends>
-        </template>
-    </define-rule>
-
     <!-- ================================================================= -->
     <!--                            wxBase library                         -->
     <!-- ================================================================= -->
@@ -36,8 +22,6 @@
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxbase" cond="MONOLITHIC=='0'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">base=baselib+basedll</set>
 
 
@@ -60,8 +44,6 @@
         <msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxnet" cond="MONOLITHIC=='0'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">net=netlib+netdll</set>
 
 
@@ -86,8 +68,6 @@
         <msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxcore" cond="MONOLITHIC=='0' and USE_GUI=='1'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">core=corelib+coredll</set>
 
 
@@ -112,8 +92,6 @@
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxadv" cond="MONOLITHIC=='0' and USE_GUI=='1'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set>
 
 
@@ -129,6 +107,7 @@
         <msvc-headers>$(MEDIA_HDR)</msvc-headers>
         <library>coredll</library>
         <library>basedll</library>
+        <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
     </dll>
 
     <lib id="medialib" template="wx_lib"
@@ -137,8 +116,6 @@
         <msvc-headers>$(MEDIA_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxmedia" cond="MONOLITHIC=='0' and USE_GUI=='1' and USE_MEDIA=='1'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set>
 
 
@@ -162,6 +139,7 @@
         <msvc-headers>$(ODBC_HDR)</msvc-headers>
     </lib>
 
+
     <dll id="dbgriddll" template="wx_dll"
          cond="SHARED=='1' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>
@@ -180,9 +158,6 @@
         <msvc-headers>$(DBGRID_HDR)</msvc-headers>
     </lib>
 
-    <!-- <wxshortcut id="wxodbc" cond="MONOLITHIC=='0' and USE_ODBC=='1'"/> -->
-    <wxshortcut id="wxdbgrid" cond="MONOLITHIC=='0' and USE_GUI=='1' and USE_ODBC=='1'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">odbc=odbclib+odbcdll</set>
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">dbgrid=dbgridlib+dbgriddll</set>
 
@@ -202,19 +177,12 @@
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </dll>
 
-    <!-- use this to conditonally link against htmldll with <library>: -->
-    <set var="htmldll_library_link">
-        <if cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">htmldll</if>
-    </set>
-
     <lib id="htmllib" template="wx_lib"
          cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
         <sources>$(HTML_SRC)</sources>
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxhtml" cond="MONOLITHIC=='0' and USE_HTML=='1'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
 
     <!-- ================================================================ -->
@@ -247,8 +215,6 @@
         <msvc-headers>$(QA_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxqa" cond="MONOLITHIC=='0' and USE_QA=='1'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">qa=qalib+qadll</set>
 
     <!-- ================================================================ -->
@@ -271,8 +237,6 @@
         <msvc-headers>$(XML_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxxml" cond="MONOLITHIC=='0'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xml=xmllib+xmldll</set>
 
     <!-- ================================================================ -->
@@ -284,7 +248,7 @@
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_XRC</define>
         <sources>$(XRC_SRC)</sources>
-        <library>$(htmldll_library_link)</library>
+        <library>htmldll</library>
         <library>advdll</library>
         <library>coredll</library>
         <library>xmldll</library>
@@ -298,8 +262,6 @@
         <msvc-headers>$(XRC_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxxrc" cond="MONOLITHIC=='0' and USE_XRC=='1'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set>
 
     <!-- ================================================================ -->
@@ -322,8 +284,6 @@
         <sources>$(AUI_SRC)</sources>
         <msvc-headers>$(AUI_HDR)</msvc-headers>
     </lib>
-    
-    <wxshortcut id="wxaui" cond="MONOLITHIC=='0' and USE_AUI=='1'"/>
 
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">aui=auilib+auidll</set>
 
@@ -337,7 +297,7 @@
         <define>WXMAKINGDLL_RICHTEXT</define>
         <sources>$(RICHTEXT_SRC)</sources>
         <library>advdll</library>
-        <library>$(htmldll_library_link)</library>
+        <library>htmldll</library>
         <library>xmldll</library>
         <library>coredll</library>
         <library>basedll</library>
@@ -349,43 +309,7 @@
         <sources>$(RICHTEXT_SRC)</sources>
         <msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
     </lib>
-    
-    <wxshortcut id="wxrichtext" cond="MONOLITHIC=='0' and USE_RICHTEXT=='1'"/>
 
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">richtext=richtextlib+richtextdll</set>
 
-    <!-- ================================================================ -->
-    <!--                            STC                                   -->
-    <!-- ================================================================ -->
-
-    <template id="stc_base">
-        <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
-        <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
-        <define>__WX__</define>
-        <define>SCI_LEXER</define>
-        <define>LINK_LEXERS</define>
-        <cppflags-borland>-w-8027</cppflags-borland>
-        <library>wxscintilla</library>
-    </template>
-
-    <dll id="stcdll" template="wx_dll,stc_base"
-         cond="SHARED=='1' and USE_STC=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_STC</define>
-        <sources>$(STC_SRC)</sources>
-        <library>coredll</library>
-        <library>basedll</library>
-        <msvc-headers>$(STC_HDR)</msvc-headers>
-    </dll>
-
-    <lib id="stclib" template="wx_lib,stc_base"
-         cond="SHARED=='0' and USE_STC=='1' and MONOLITHIC=='0'">
-        <sources>$(STC_SRC)</sources>
-        <msvc-headers>$(STC_HDR)</msvc-headers>
-    </lib>
-    
-    <wxshortcut id="wxstc" cond="MONOLITHIC=='0' and USE_STC=='1'"/>
-
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">stc=stclib+stcdll</set>
-
 </makefile>

build/bakefiles/opengl.bkl

@@ -28,6 +28,7 @@
         <depends>coredll</depends>
         <!-- link against the wxWin library in monolithic build: -->
         <sys-lib>$(WXLIB_MONO)</sys-lib>
+        <depends>monodll</depends>
 
         <ldlibs>$(EXTRALIBS_OPENGL)</ldlibs>
     </dll>
@@ -38,6 +39,4 @@
         <msvc-headers>$(OPENGL_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxgl" cond="USE_GUI=='1' and USE_OPENGL=='1'"/>
-
 </makefile>

build/bakefiles/scintilla.bkl

@@ -1,116 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <if cond="FORMAT=='autoconf'">
-        <set var="LIB_SCINTILLA">
-          wxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-        </set>
-    </if>
-    <if cond="FORMAT!='autoconf'">
-        <set var="LIB_SCINTILLA">
-            wxscintilla$(WXDEBUGFLAG)$(HOST_SUFFIX)
-        </set>
-    </if>
-    <set var="INC_SCINTILLA">
-        $(TOP_SRCDIR)src/stc/scintilla/include
-    </set>
-
-    <lib id="wxscintilla" template="3rdparty_lib"
-         cond="USE_STC=='1' and BUILDING_LIB=='1'">
-        <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
-        <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
-        <define>__WX__</define>
-        <define>SCI_LEXER</define>
-        <define>LINK_LEXERS</define>
-        <dirname>$(LIBDIRNAME)</dirname>
-        <sources>
-	    src/stc/scintilla/src/AutoComplete.cxx
-	    src/stc/scintilla/src/CallTip.cxx
-	    src/stc/scintilla/src/CellBuffer.cxx
-	    src/stc/scintilla/src/CharClassify.cxx
-	    src/stc/scintilla/src/ContractionState.cxx
-	    src/stc/scintilla/src/Document.cxx
-	    src/stc/scintilla/src/DocumentAccessor.cxx
-	    src/stc/scintilla/src/Editor.cxx
-	    src/stc/scintilla/src/ExternalLexer.cxx
-	    src/stc/scintilla/src/Indicator.cxx
-	    src/stc/scintilla/src/KeyMap.cxx
-	    src/stc/scintilla/src/KeyWords.cxx
-	    src/stc/scintilla/src/LexAPDL.cxx
-	    src/stc/scintilla/src/LexAU3.cxx
-	    src/stc/scintilla/src/LexAVE.cxx
-	    src/stc/scintilla/src/LexAda.cxx
-	    src/stc/scintilla/src/LexAsm.cxx
-	    src/stc/scintilla/src/LexAsn1.cxx
-	    src/stc/scintilla/src/LexBaan.cxx
-	    src/stc/scintilla/src/LexBash.cxx
-	    src/stc/scintilla/src/LexBasic.cxx
-	    src/stc/scintilla/src/LexBullant.cxx
-	    src/stc/scintilla/src/LexCLW.cxx
-	    src/stc/scintilla/src/LexCPP.cxx
-	    src/stc/scintilla/src/LexCSS.cxx
-	    src/stc/scintilla/src/LexCaml.cxx
-	    src/stc/scintilla/src/LexCsound.cxx
-	    src/stc/scintilla/src/LexConf.cxx
-	    src/stc/scintilla/src/LexCrontab.cxx
-	    src/stc/scintilla/src/LexEScript.cxx
-	    src/stc/scintilla/src/LexEiffel.cxx
-	    src/stc/scintilla/src/LexErlang.cxx
-	    src/stc/scintilla/src/LexFlagship.cxx
-	    src/stc/scintilla/src/LexForth.cxx
-	    src/stc/scintilla/src/LexFortran.cxx
-	    src/stc/scintilla/src/LexGui4Cli.cxx
-	    src/stc/scintilla/src/LexHTML.cxx
-	    src/stc/scintilla/src/LexHaskell.cxx
-	    src/stc/scintilla/src/LexInno.cxx
-	    src/stc/scintilla/src/LexKix.cxx
-	    src/stc/scintilla/src/LexLisp.cxx
-	    src/stc/scintilla/src/LexLout.cxx
-	    src/stc/scintilla/src/LexLua.cxx
-	    src/stc/scintilla/src/LexMMIXAL.cxx
-	    src/stc/scintilla/src/LexMPT.cxx
-	    src/stc/scintilla/src/LexMSSQL.cxx
-	    src/stc/scintilla/src/LexMatlab.cxx
-	    src/stc/scintilla/src/LexMetapost.cxx
-	    src/stc/scintilla/src/LexNsis.cxx
-	    src/stc/scintilla/src/LexOpal.cxx
-	    src/stc/scintilla/src/LexOthers.cxx
-	    src/stc/scintilla/src/LexPB.cxx
-	    src/stc/scintilla/src/LexPOV.cxx
-	    src/stc/scintilla/src/LexPS.cxx
-	    src/stc/scintilla/src/LexPascal.cxx
-	    src/stc/scintilla/src/LexPerl.cxx
-	    src/stc/scintilla/src/LexPython.cxx
-	    src/stc/scintilla/src/LexRebol.cxx
-	    src/stc/scintilla/src/LexRuby.cxx
-	    src/stc/scintilla/src/LexSQL.cxx
-	    src/stc/scintilla/src/LexSmalltalk.cxx
-	    src/stc/scintilla/src/LexTADS3.cxx
-	    src/stc/scintilla/src/LexScriptol.cxx
-	    src/stc/scintilla/src/LexSpecman.cxx
-	    src/stc/scintilla/src/LexSpice.cxx
-	    src/stc/scintilla/src/LexTCL.cxx
-	    src/stc/scintilla/src/LexTeX.cxx
-	    src/stc/scintilla/src/LexVB.cxx
-	    src/stc/scintilla/src/LexVHDL.cxx
-	    src/stc/scintilla/src/LexVerilog.cxx
-	    src/stc/scintilla/src/LexYAML.cxx
-	    src/stc/scintilla/src/LineMarker.cxx
-	    src/stc/scintilla/src/PropSet.cxx
-	    src/stc/scintilla/src/RESearch.cxx
-	    src/stc/scintilla/src/ScintillaBase.cxx
-	    src/stc/scintilla/src/Style.cxx
-	    src/stc/scintilla/src/StyleContext.cxx
-	    src/stc/scintilla/src/UniConversion.cxx
-	    src/stc/scintilla/src/ViewStyle.cxx
-	    src/stc/scintilla/src/WindowAccessor.cxx
-	    src/stc/scintilla/src/XPM.cxx
-        </sources>
-    </lib>
-    
-    <!-- use this to conditonally link against wxscintilla with <library>: -->
-    <set var="wxscintilla_library_link">
-        <if cond="USE_STC=='1' and BUILDING_LIB=='1'">wxscintilla</if>
-    </set>
-
-</makefile>

build/bakefiles/tiff.bkl

@@ -23,24 +23,18 @@
             </if>
         </set>
     </if>
-
-    <set var="INC_TIFF_BUILD"></set>
-    <if cond="FORMAT=='autoconf'">
-        <set var="INC_TIFF_BUILD">
-            <if cond="wxUSE_LIBTIFF=='builtin'">$(wx_top_builddir)/src/tiff/libtiff</if>
-        </set>
-    </if>
     <set var="INC_TIFF">
-        <if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff/libtiff</if>
+        <if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff</if>
     </set>
 
     <set var="TIFF_PLATFORM_SRC">
-        <if cond="PLATFORM_UNIX=='1'">src/tiff/libtiff/tif_unix.c</if>
+        <if cond="PLATFORM_UNIX=='1'">src/tiff/tif_unix.c</if>
-        <if cond="PLATFORM_MACOSX=='1'">src/tiff/libtiff/tif_unix.c</if>
+        <if cond="PLATFORM_MACOSX=='1'">src/tiff/tif_unix.c</if>
-        <if cond="PLATFORM_OS2=='1'">src/tiff/libtiff/tif_unix.c</if>
+        <if cond="PLATFORM_OS2=='1' and FORMAT!='watcom'">src/tiff/tif_unix.c</if>
-        <if cond="PLATFORM_WIN32=='1'">src/tiff/libtiff/tif_win32.c</if>
+        <if cond="PLATFORM_OS2=='1' and FORMAT=='watcom'">src/tiff/tif_os2.c</if>
-        <if cond="PLATFORM_MACOS=='1'">src/tiff/libtiff/tif_apple.c</if>
+        <if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
-        <if cond="PLATFORM_MSDOS=='1'">src/tiff/libtiff/tif_msdos.c</if>
+        <if cond="PLATFORM_MACOS=='1'">src/tiff/tif_apple.c</if>
+        <if cond="PLATFORM_MSDOS=='1'">src/tiff/tif_msdos.c</if>
     </set>
 
     <lib id="wxtiff" template="3rdparty_lib"
@@ -48,8 +42,6 @@
         <dirname>$(LIBDIRNAME)</dirname>
         <include>$(INC_ZLIB)</include>
         <include>$(INC_JPEG)</include>
-        <include>$(INC_TIFF_BUILD)</include>
-        <include>$(INC_TIFF)</include>
         <cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
         <cflags-dmars>-w2</cflags-dmars>
         <cflags-watcom>-wcd=124</cflags-watcom>
@@ -57,41 +49,40 @@
         <define cond="PLATFORM_MSDOS=='1' and FORMAT=='watcom'">__MSDOS__</define>
         <sources>
             $(TIFF_PLATFORM_SRC)
-            src/tiff/libtiff/tif_aux.c
+            src/tiff/tif_aux.c
-            src/tiff/libtiff/tif_close.c
+            src/tiff/tif_close.c
-            src/tiff/libtiff/tif_codec.c
+            src/tiff/tif_codec.c
-            src/tiff/libtiff/tif_color.c
+            src/tiff/tif_color.c
-            src/tiff/libtiff/tif_compress.c
+            src/tiff/tif_compress.c
-            src/tiff/libtiff/tif_dir.c
+            src/tiff/tif_dir.c
-            src/tiff/libtiff/tif_dirinfo.c
+            src/tiff/tif_dirinfo.c
-            src/tiff/libtiff/tif_dirread.c
+            src/tiff/tif_dirread.c
-            src/tiff/libtiff/tif_dirwrite.c
+            src/tiff/tif_dirwrite.c
-            src/tiff/libtiff/tif_dumpmode.c
+            src/tiff/tif_dumpmode.c
-            src/tiff/libtiff/tif_error.c
+            src/tiff/tif_error.c
-            src/tiff/libtiff/tif_extension.c
+            src/tiff/tif_extension.c
-            src/tiff/libtiff/tif_fax3.c
+            src/tiff/tif_fax3.c
-            src/tiff/libtiff/tif_fax3sm.c
+            src/tiff/tif_fax3sm.c
-            src/tiff/libtiff/tif_flush.c
+            src/tiff/tif_getimage.c
-            src/tiff/libtiff/tif_getimage.c
+            src/tiff/tif_jpeg.c
-            src/tiff/libtiff/tif_jpeg.c
+            src/tiff/tif_flush.c
-            src/tiff/libtiff/tif_luv.c
+            src/tiff/tif_lzw.c
-            src/tiff/libtiff/tif_lzw.c
+            src/tiff/tif_luv.c
-            src/tiff/libtiff/tif_next.c
+            src/tiff/tif_next.c
-            src/tiff/libtiff/tif_ojpeg.c
+            src/tiff/tif_open.c
-            src/tiff/libtiff/tif_open.c
+            src/tiff/tif_packbits.c
-            src/tiff/libtiff/tif_packbits.c
+            src/tiff/tif_pixarlog.c
-            src/tiff/libtiff/tif_pixarlog.c
+            src/tiff/tif_predict.c
-            src/tiff/libtiff/tif_predict.c
+            src/tiff/tif_print.c
-            src/tiff/libtiff/tif_print.c
+            src/tiff/tif_read.c
-            src/tiff/libtiff/tif_read.c
+            src/tiff/tif_swab.c
-            src/tiff/libtiff/tif_strip.c
+            src/tiff/tif_strip.c
-            src/tiff/libtiff/tif_swab.c
+            src/tiff/tif_thunder.c
-            src/tiff/libtiff/tif_thunder.c
+            src/tiff/tif_tile.c
-            src/tiff/libtiff/tif_tile.c
+            src/tiff/tif_version.c
-            src/tiff/libtiff/tif_version.c
+            src/tiff/tif_warning.c
-            src/tiff/libtiff/tif_warning.c
+            src/tiff/tif_write.c
-            src/tiff/libtiff/tif_write.c
+            src/tiff/tif_zip.c
-            src/tiff/libtiff/tif_zip.c
         </sources>
     </lib>
 

build/bakefiles/version.bkl

@@ -23,9 +23,9 @@
        3. Else, i.e. if there were no changes at all to API but only internal
           changes, change C:R:A to C:R+1:A
     -->
-    <set var="WX_CURRENT">0</set>
+    <set var="WX_CURRENT">8</set>
     <set var="WX_REVISION">0</set>
-    <set var="WX_AGE">0</set>
+    <set var="WX_AGE">8</set>
 
 
     <!-- ================================================================== -->

build/bakefiles/wx.bkl

@@ -221,7 +221,7 @@
             <depends-on-file>$(SRCDIR)/include/wx/msw/genrcdefs.h</depends-on-file>
 
             <command>
-                $(DOLLAR)(CPP) "$(SRCDIR)\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
+                $(DOLLAR)(CPP) "$(nativePaths(SRCDIR))\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
             </command>
 
         </action>

build/bakefiles/wxpresets/bakefile_quickstart.txt

@@ -112,6 +112,7 @@ would like to build, separated by commas. Valid values are:
 
     autoconf      GNU autoconf Makefile.in files
     borland       Borland C/C++ makefiles
+    cbuilderx     C++ Builder X project files
     dmars         Digital Mars makefiles
     dmars_smake   Digital Mars makefiles for SMAKE
     gnu           GNU toolchain makefiles (Unix)

build/bakefiles/wxpresets/libsample/configure.in

@@ -1,64 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.59)
-AC_INIT([libsample],[1.2.5],[vslavik@fastmail.fm])
-AC_CONFIG_SRCDIR([libsample.cpp])
-
-
-dnl ---------------------------------------------------------------------------
-dnl DEFINE CONFIGURE OPTIONS
-dnl ---------------------------------------------------------------------------
-
-dnl define all the wx-config related options
-dnl (i.e. --with-wxdir, --with-wx-config, --with-wx-prefix, --with-wx-exec-prefix)
-WX_CONFIG_OPTIONS
-
-dnl define all the wxpresets related options
-WX_STANDARD_OPTIONS([debug,unicode,shared,toolkit,wxshared])
-
-
-
-dnl ---------------------------------------------------------------------------
-dnl CONFIGURE CHECKS
-dnl ---------------------------------------------------------------------------
-
-dnl these checks are required by bakefile:
-AC_CANONICAL_SYSTEM
-AC_PROG_AWK
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_RANLIB
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_CXXCPP
-
-dnl we want to always have DEBUG==WX_DEBUG and UNICODE==WX_UNICODE
-WX_DEBUG=$DEBUG
-WX_UNICODE=$UNICODE
-
-dnl the following macros will search for the best matching wxWidgets build 
-dnl (taking in count the values of the --enable-debug|unicode|shared and of
-dnl the --with-toolkit|wxshared options) and then set appropriately all the
-dnl WX_* options
-WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
-WX_CONFIG_CHECK([2.8.0], [wxWin=1],,[core,base],[$WXCONFIG_FLAGS])
-WX_DETECT_STANDARD_OPTION_VALUES
-
-dnl here all WX_* option values are available for your own processing...
-
-
-
-
-dnl ---------------------------------------------------------------------------
-dnl CONFIGURE END
-dnl ---------------------------------------------------------------------------
-
-AC_BAKEFILE([m4_include(autoconf_inc.m4)])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-
-
-dnl show a nice summary of the chosen build settings to the user
-WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN
-WX_STANDARD_OPTIONS_SUMMARY_MSG_END
-

build/bakefiles/wxpresets/libsample/libsample.bkl

@@ -1,47 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <!-- a typical nice feature which wxpresets make available to wx-based programs
-         is to allow the user to build with different configurations those programs;
-         this is achieved in few fundamental steps:
-
-          1) set a different BUILDDIR for different build configurations
-          2) set different output dirs for the libraries built with a
-             different shared/static setting
-          3) set different output names for the libraries built with
-             different unicode/ansi and release/debug settings
-    -->
-    <include file="presets/wx.bkl"/>
-
-    <!-- the following line implements step #1: -->
-    <set-wxlike-builddir/>
-
-    <!-- through the use of the 'wx-lib' and 'wxlike' templates, we'll get
-         the ability to compile against any wxWidgets build using, for our
-         program, the same configuration of the selected wxWidgets build.
-    -->
-    <template id="my" template="wx-lib,wxlike">
-        <!-- wxlike-dirname implements step #2 (see initial comment) -->
-        <wxlike-dirname>lib</wxlike-dirname>
-
-        <sources>libsample.cpp</sources>
-    </template>
-
-
-    <lib id="static" template="my" cond="WX_SHARED=='0'">
-        <!-- wxlike-libname implements step #3 (see initial comment) -->
-        <wxlike-libname prefix='sample'>test</wxlike-libname>
-    </lib>
-
-    <dll id="shared" template="my" cond="WX_SHARED=='1'">
-        <!-- wxlike-dllname does step #3 (see initial comment) -->
-        <wxlike-dllname prefix='sample'>test</wxlike-dllname>
-        <define>WXMAKINGDLL_LIBSAMPLE</define>
-
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </dll>
-
-</makefile>

build/bakefiles/wxpresets/libsample/libsample.cpp

@@ -1,41 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        libsample.cpp
-// Purpose:     The source of a dummy sample wx-based library
-// Author:      Francesco Montorsi
-// Modified by:
-// Created:     26/11/06
-// RCS-ID:      $Id$
-// Copyright:   (c) Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-void MyUtilityFunction()
-{
-    wxPrintf(wxT("Hello world!\n"));
-    fflush(stdout);
-}

build/bakefiles/wxpresets/presets/wx.bkl

@@ -4,133 +4,25 @@
 <!--
     Presets for building wxWidgets applications.
 
-    These presets provide the following "public" interface:
+    FIXME: docs
-
-    OPTIONS:
-
-    - WX_* : used to let the user of the generated makefile choose a wxWidgets
-             build among those available; you can use them in your project to
-             e.g. build a target only if WX_DEBUG is 0 or if WX_PORT is "msw".
-
-
-    VARIABLES:
-
-    - WXLIBPOSTFIX: contains the [u][d] string which is typically useful when
-                    defining names of directories/files which should coexist
-                    with other builds using different wxWidgets configurations.
-
-
-    TEMPLATES:
-
-    - wx, wx-lib: templates to be used respectively for <dll>/<exe> and <lib>
-                  targets; they add all the wxWidgets-related settings (e.g. the
-                  include and library search paths, the __WXDEBUG__ symbol, etc)
-
-    - wxconsole: to be used when building console-only libraries or apps
-                 (adds the wxUSE_GUI=0 define).
-
-    - wxlike: this template should be combined with "wx" or "wx-lib" and will
-              make your project build with the same Unicode, debug & shared
-              config as the wxWidgets build selected using the WX_* options.
-
-
-    TARGET TAGS:
-
-    - <wx-lib>: to define which wxWidgets libraries to link with;
-                please note that you should use them in the right order or
-                linking under Unix would result in errors, e.g.
-
-                    <wx-lib>core</wx-lib>
-                    <wx-lib>base</wx-lib>
-
-                is correct, but the reverse is not (if lib A depends on lib B, then
-                lib A must be listed before B). So <wx-lib>base</wx-lib>
-                (which must always be present) should be the last wx-lib tag.
-
-    - <wxlike-libname>,
-      <wxlike-dllname>: useful if you want to have a build logic similar to the
-                        wxWidgets build logic which allows different builds to
-                        coexist without conflicts. These tags helps you to name
-                        libraries using the same wxWidgets rules and thus avoid
-                        conflicts between libraries compiled in e.g. Unicode,
-                        shared mode and those compiled in ANSI, shared mode &c.
-
-    - <wxlike-lib>: if your library/application needs to link with both
-                    wxWidgets and some other wx-based library, which in turn
-                    follows the wxWidgets naming conventions, then this tag is
-                    what you need to reference the wx-based additional library.
-
-    - <wxlike-dirname>: sets the output directory for the current target to $(value)
-                        when on Unix and to e.g. $(value)/vc_lib when on Windows,
-                        i.e. acts like <dirname> just following wxWidgets naming rules.
-                        Useful to allow multiple builds of the 
-
-    - <wxlike-paths>: if your library/application needs to compile & link with both
-                      wxWidgets and some other wx-based library, which in turn
-                      follows the wxWidgets naming conventions, then this tag is
-                      what you need to add to the compiler and linker flags the paths
-                      of the "include" and "lib" folders of the wx-based additional library.
-
-
-    GLOBAL TAGS:
-
-    - <set-wxlike-builddir>: sets BUILDDIR using wxWidgets naming rules to help
-                             to keep object files compiled with different
-                             settings separate.
-
-    - <set-wxlike>: sets a variable with the name of a library named with the same
-                    wxWidgets rules.
-
-
- NOTE: as a reference here is a list of all wxWidgets libraries satisfying
-       the dependency constraints mentioned in <wx-lib> description:
-
-        <wx-lib>richtext</wx-lib>
-        <wx-lib>aui</wx-lib>
-        <wx-lib>stc</wx-lib>
-        <wx-lib>qa</wx-lib>
-        <wx-lib>dbgrid</wx-lib>
-        <wx-lib>gl</wx-lib>
-        <wx-lib>odbc</wx-lib>
-        <wx-lib>xrc</wx-lib>
-        <wx-lib>html</wx-lib>
-        <wx-lib>media</wx-lib>
-        <wx-lib>adv</wx-lib>
-        <wx-lib>net</wx-lib>
-        <wx-lib>xml</wx-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-
 -->
 
 
 <makefile>
 
-    <requires version="0.2.2"/>
-
-
     <!-- this variable identifies the version of the wx presets.
-         this is changed only when major changes to wxpresets take place. 
+         this is changed only when major changes to wxpresets take place. -->
-    -->
+    <set var="WX_PRESETS_VERSION">3</set>
-    <set var="WX_PRESETS_VERSION">4</set>
 
-    <!-- list of known libraries used by wx-lib tag defined in wx_unix.bkl and wx_win32.bkl
+    <!-- list of known libraries used by wx-lib tag defined in wx_unix.bkl and wx_win32.bkl -->
-         VERY IMPORTANT: when updating this list also update the <wx-lib> and <wx-all-libs>
+    <set var="LIB_LIST">
-                         tag definitions.
+        base core net xml odbc xrc html adv media gl dbgrid qa aui richtext
-    -->
-    <set var="WX_LIB_LIST">
-        base core net xml odbc xrc html adv media gl dbgrid qa aui richtext stc
     </set>
 
-    <!-- if you define this variable to 0 before including wx presets, the
+    <!-- NOTE: refer to the NET contrib using NETUTILS instead of NET
-         "test_for_selected_wxbuild" target which is added by default in win32 and GNU 
+               (which is already in LIB_LIST) -->
-         makefiles, won't be added.
+    <set var="CONTRIBLIB_LIST">animate applet deprecated fl foldbar gizmos mmedia netutils ogl plot stc svg</set>
-         This is useful when e.g. you want to have wxWidgets as an optional
+    <set var="ALLLIB_LIST">$(LIB_LIST) $(CONTRIBLIB_LIST)</set>
-         dependency and thus you don't want to perform that check unconditionally.
-    -->
-    <set var="WX_TEST_FOR_SELECTED_WXBUILD" overwrite="0">
-        1
-    </set>
 
     <!-- this is a temporary variable until there is non general    -->
     <!-- function in bakefiles for returning native markup for      -->
@@ -141,109 +33,6 @@
     </set>
 
 
-
-    <!--                        OPTIONS                             -->
-    <!--                                                            -->
-    <!--    These are essentially the configurations you            -->
-    <!--    want in bakefile.                                       -->
-    <!--                                                            -->
-    <!--    In MSVC these are the different build                   -->
-    <!--    configurations you can have (in the build menu),        -->
-    <!--    and in autoconf is enabled with enable-xxx=xx.          -->
-    <!--    For other compilers a separate configuration            -->
-    <!--    file is created (such as config.gcc on gcc)             -->
-    <!--    which has several options a user can modify.            -->
-    <!--                                                            -->
-    <!--    Note that the above only happens if an option           -->
-    <!--    is not constant, i.e. if it cannot be determined        -->
-    <!--    by bakefile itself.                                     -->
-    <!--    Also note that for 'autoconf' format these options      -->
-    <!--    are only useful when used together with wxpresets.m4    -->
-    <!--    macro file which contains macros for detecting the      -->
-    <!--    option values for wx-based projects. See wxpresets.m4   -->
-    <!--    comments for more info.                                 -->
-
-
-    <!-- Presets for limited dmars make.exe format: -->
-    <if cond="FORMAT=='dmars'">
-        <set var="WX_UNICODE">0</set>
-        <set var="WX_DEBUG">1</set>
-        <set var="WX_SHARED">0</set>
-    </if>
-
-    <!-- 'gnu' format needs to redefine the following options later in wx_unix.bkl -->
-    <if cond="FORMAT=='gnu'">
-        <set var="WX_UNICODE"/>
-        <set var="WX_DEBUG"/>
-        <set var="WX_SHARED"/>
-        <set var="WX_PORT"/>
-        <set var="WX_VERSION"/>
-    </if>
-
-
-    <!--    This is a standard option that determines               -->
-    <!--    whether the user wants to build this library as         -->
-    <!--    a dll or as a static library.                           -->
-    <if cond="not isdefined('WX_SHARED')">
-        <set var="WX_SHARED_DEFAULT" overwrite="0">0</set>
-        <option name="WX_SHARED">
-            <values>0,1</values>
-            <values-description>Static,DLL</values-description>
-            <default-value>$(WX_SHARED_DEFAULT)</default-value>
-            <description>
-                Use DLL build of wx library?
-            </description>
-        </option>
-    </if>
-
-    <!-- Configuration for building the bakefile with               -->
-    <!-- unicode strings or not (unicode or ansi).                  -->
-    <if cond="not isdefined('WX_UNICODE')">
-        <set var="WX_UNICODE_DEFAULT" overwrite="0">0</set>
-        <option name="WX_UNICODE">
-            <values>0,1</values>
-            <values-description>ANSI,Unicode</values-description>
-            <default-value>$(WX_UNICODE_DEFAULT)</default-value>
-            <description>
-                Use Unicode build of wxWidgets?
-            </description>
-        </option>
-    </if>
-
-    <if cond="not isdefined('WX_DEBUG')">
-        <set var="WX_DEBUG_DEFAULT" overwrite="0">1</set>
-        <option name="WX_DEBUG">
-            <values>0,1</values>
-            <values-description>Release,Debug</values-description>
-            <default-value>$(WX_DEBUG_DEFAULT)</default-value>
-            <description>
-                Use debug build of wxWidgets (define __WXDEBUG__)?
-            </description>
-        </option>
-    </if>
-
-    <if cond="not isdefined('WX_VERSION')">
-        <set var="WX_VERSION_DEFAULT" overwrite="0">29</set>
-        <option name="WX_VERSION">
-            <default-value>$(WX_VERSION_DEFAULT)</default-value>
-            <description>
-                Version of the wx library to build against.
-            </description>
-        </option>
-    </if>
-
-    <if cond="not isdefined('WX_MONOLITHIC')">
-        <set var="WX_MONOLITHIC_DEFAULT" overwrite="0">0</set>
-        <option name="WX_MONOLITHIC">
-            <values>0,1</values>
-            <values-description>Multilib,Monolithic</values-description>
-            <default-value>$(WX_MONOLITHIC_DEFAULT)</default-value>
-            <description>
-                Use monolithic build of wxWidgets?
-            </description>
-        </option>
-    </if>
-
     <!-- The directory where wxWidgets is installed: -->
     <if cond="not isdefined('WX_DIR')">
         <set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
@@ -257,21 +46,6 @@
 
 
 
-    <!--                     HELPER VARIABLES                       -->
-    <!--                                                            -->
-
-    <!--    These are handy ways of dealing with the                -->
-    <!--    extensions in the library names of the                  -->
-    <!--    wxWindows library.                                      -->
-    <set var="WXLIBPOSTFIX">
-        <if cond="WX_DEBUG=='1' and WX_UNICODE=='1'">ud</if>
-        <if cond="WX_DEBUG=='1' and WX_UNICODE=='0'">d</if>
-        <if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
-    </set>
-
-
-
-
     <!-- this is just a wrapper that includes the real implementation: -->
 
     <set var="__wx_included_impl">0</set>
@@ -290,239 +64,4 @@
         <error>This format is not (yet) supported by wx preset.</error>
     </if>
 
-
-
-
-    <!--                     HIGH-LEVEL TEMPLATE                    -->
-    <!--                                                            -->
-
-    <!-- Combine 'wxlike' with 'wx' or 'wx-lib' templates to have your
-         project build in the same configuration used by the selected
-         wxWidgets build -->
-    <template id="wxlike">
-        <!-- WX_DEBUG-dependent -->
-        <set var="_OPT">
-            <if cond="WX_DEBUG=='1'">off</if>
-            <if cond="WX_DEBUG=='0'">speed</if>
-        </set>
-        <set var="_DEBUGINFO">
-            <if cond="WX_DEBUG=='1'">on</if>
-            <if cond="WX_DEBUG=='0'">off</if>
-        </set>
-
-        <if cond="FORMAT!='autoconf'">
-            <optimize>$(_OPT)</optimize>
-            <debug-info>$(_DEBUGINFO)</debug-info>
-        </if>
-    </template>
-
-    <!-- Template for building wx-based console applications -->
-    <template id="wxconsole" template="wx">
-        <define>wxUSE_GUI=0</define>
-        <app-type>console</app-type>
-    </template>
-
-
-
-    <!--                       UTILITY TAGS                         -->
-    <!--                                                            -->
-
-    <!-- private helper tag: does the same thing as for <set-wxlike> except that:
-         - the variable created is always named "__temp"
-         - can be used (only) inside targets as this is a non-global tag
-    -->
-    <define-tag name="__setlibname" rules="lib,dll,module,exe">
-        <set var="__temp">
-            <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">
-                $(attributes['prefix'])_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
-            </if>
-            <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">
-                $(attributes['prefix'])_$(WX_PORT)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
-            </if>
-        </set>
-    </define-tag>
-
-    <!-- A simple tag which helps you to define a library name using the same rules used
-         by wxWidgets. Use the 'prefix' attribute to add your lib's prefix.
-         E.g.:
-             <wxlike-libname prefix='mylib'>module1</wxlike-libname>
-             <wxlike-libname prefix='mylib'>module2</wxlike-libname>
-    -->
-    <define-tag name="wxlike-libname" rules="lib">
-        <__setlibname prefix="$(attributes['prefix'])">$(value)</__setlibname>
-        <libname>$(__temp)</libname>
-    </define-tag>
-
-    <!-- exactly like <wxlike-libname> but this one sets the DLL name (and the DLL lib import name)
-         and thus must be used only inside a <dll> target...
-    -->
-    <define-tag name="wxlike-dllname" rules="dll,module">
-        <__setlibname prefix="$(attributes['prefix'])">$(value)</__setlibname>
-        <libname>$(__temp)</libname>
-        <dllname>$(__temp)</dllname>
-    </define-tag>
-
-    <!-- Links against a library which uses the same wxWidgets conventions.
-    -->
-    <define-tag name="wxlike-lib" rules="exe,lib,dll,module">
-        <__setlibname prefix="$(attributes['prefix'])">$(value)</__setlibname>
-        <sys-lib>$(__temp)</sys-lib>
-    </define-tag>
-
-    <!-- Sets as output folder for the current target a directory
-         called "$(value)/$(COMPILER)_lib|dll", just like wxWidgets does.
-         This makes it possible to keep separed the libraries/exes compiled with
-         different compilers and with a different value for WX_SHARED.
-    -->
-    <define-tag name="wxlike-dirname" rules="lib,dll,exe,module">
-        <if cond="FORMAT!='autoconf'">
-            <set var="_DIRNAME_SHARED_SUFFIX">
-                <if cond="WX_SHARED=='0'">lib</if>
-                <if cond="WX_SHARED=='1'">dll</if>
-            </set>
-            <set var="_DIRNAME">
-                $(value)/$(COMPILER)_$(_DIRNAME_SHARED_SUFFIX)
-            </set>
-
-            <dirname>$(_DIRNAME)</dirname>
-
-            <if cond="FORMAT_SUPPORTS_ACTIONS=='1'">
-                <set var="__mkdir_tgt">make_dir_$(id)</set>
-
-                <add-target target="$(__mkdir_tgt)" type="action"/>
-                <modify-target target="$(__mkdir_tgt)">
-                    <command cond="TOOLSET=='unix'">
-                        @mkdir -p $(_DIRNAME)
-                    </command>
-                    <command cond="TOOLSET in ['win32','os2','dos']">
-                        if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME))
-                    </command>
-            </modify-target>
-
-                <!-- the following code is mostly equivalent to a:
-                          <dependency-of>$(id)</dependency-of>
-                     put into the __mkdir_tgt target, except that it does _prepend_
-                     the __mkdir_tgt dependency instead of appending it.
-
-                     This is required because some compilers (e.g. MSVC) need to store in the
-                     output folder some files (e.g. the PDB file) while compiling and thus
-                     the library output folder must have been created before _any_ source file
-                     is compiled, not just before the library is linked.
-                -->
-                <modify-target target="$(id)">
-                    <set var="__deps" prepend="1">
-                        $(substitute(__mkdir_tgt, lambda x: ref('__depname', x), 'DEP'))
-                    </set>
-                </modify-target>
-            </if>
-        </if>
-        <if cond="FORMAT=='autoconf'">
-            <set var="_DIRNAME">$(value)</set>
-            <dirname>$(_DIRNAME)</dirname>
-        </if>
-    </define-tag>
-
-    <!-- Adds to the compiler & linker flags the path for the "include" and the
-         "lib" folders of a library following wxWidgets conventions which is 
-         located in $(value).
-    -->
-    <define-tag name="wxlike-paths" rules="exe,lib,dll,module">
-        <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">
-            <!-- WXLIBPATH is a path like "/lib/vc_lib"
-                 NOTE: even if this template is going to be used for a "lib"
-                       target (which does not uses lib-paths at all), we can still
-                       use the <lib-path> target: it will just be discarded
-             -->
-            <lib-path>$(value)$(WXLIBPATH)</lib-path>
-
-            <!-- no special include paths for a lib following wxWidgets naming
-                 conventions -->
-            <include>$(value)/include</include>
-        </if>
-
-        <!-- for autoconf format the user should use CPPFLAGS and LDFLAGS to
-             specify non-system paths since the wx-based library should have
-             been installed in standard paths
-        -->
-    </define-tag>
-
-
-
-    <!--                   UTILITY GLOBAL TAGS                      -->
-    <!--                                                            -->
-
-    <!-- Sets the BUILDDIR variable using the same rules used by wxWidgets itself.
-         This makes it possible to keep separed the object files compiled with
-         different configuration settings.
-    -->
-    <define-global-tag name="set-wxlike-builddir">
-        <!-- note that the builddir for autoconf should always be '.' -->
-        <if cond="FORMAT!='autoconf'">
-            <set var="_BUILDDIR_SHARED_SUFFIX">
-                <if cond="WX_SHARED=='0'"></if>
-                <if cond="WX_SHARED=='1'">_dll</if>
-            </set>
-
-            <set var="BUILDDIR">
-                $(COMPILER)$(WX_PORT)$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)
-            </set>
-        </if>
-    </define-global-tag>
-
-    <!-- Sets a variable with the name of the 'var' attribute value using the
-         same rules used for wxWidgets library naming.
-         E.g.
-
-            <set-wxlike var='MYMODULE_LIBNAME' prefix='mylib'>
-                mymodule
-            </set-wxlike>
-
-         This tag also supports a 'cond' attribute making it very powerful
-         for conditional linking a wx-based library:
-
-            <option name="USE_MYMODULE">
-                <values>0,1</values>
-            </option>
-            <set-wxlike var='MYMODULE_DEP'
-                        prefix='mylib'
-                        cond="USE_MYMODULE=='1'">
-                mymodule
-            </set-wxlike>
-            ...
-            <exe id="myexe">
-                <sys-lib>$(MYMODULE_DEP)</sys-lib>
-            </exe>
-    -->
-    <define-global-tag name="set-wxlike">
-        <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">
-            <if cond="'cond' not in attributes">
-                <set var="$(attributes['var'])">
-                    $(attributes['prefix'])_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
-                </set>
-            </if>
-            <if cond="'cond' in attributes">
-                <set var="$(attributes['var'])">
-                    <if cond="$(attributes['cond'])">
-                        $(attributes['prefix'])_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
-                    </if>
-                </set>
-            </if>
-        </if>
-
-        <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">
-            <if cond="'cond' not in attributes">
-                <set var="$(attributes['var'])">
-                    $(attributes['prefix'])_$(WX_PORT)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
-                </set>
-            </if>
-            <if cond="'cond' in attributes">
-                <set var="$(attributes['var'])">
-                    <if cond="$(attributes['cond'])">
-                        $(attributes['prefix'])_$(WX_PORT)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
-                    </if>
-                </set>
-            </if>
-        </if>
-    </define-global-tag>
-
 </makefile>

build/bakefiles/wxpresets/presets/wx_unix.bkl

@@ -5,217 +5,64 @@
 Presents for building wxWidgets applications using Autoconf or GNU toosets.
 See wx.bkl for platform-independent notes.
 
+Usage:
+    Options WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS are defined.
+
+
 Format-specific notes:
 
 * autoconf:
         Beware that you have to use AM_OPTIONS_WXCONFIG and
-        AM_PATH_WXCONFIG in your configure.in to get at least the
+        AM_PATH_WXCONFIG in your configure.in!
-        WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS option values defined.
-        To detect the WX_* option values typically you also want to use
-        the AM_WXPRESETS_OPTIONS and AM_WXPRESETS_CHECKS macros
-        (see wxpresets.m4 for more info).
 
 -->
 
 
 <makefile>
 
-
-
     <!-- ============================================================== -->
     <!--                           Autoconf                             -->
     <!-- ============================================================== -->
 
     <if cond="FORMAT=='autoconf'">
+        <!-- Autoconf backend is simplicity itself thanks to wx-config... -->
         <option name="WX_CFLAGS"/>
         <option name="WX_CXXFLAGS"/>
         <option name="WX_CPPFLAGS"/>
         <option name="WX_LIBS"/>
         <option name="WX_RESCOMP"/>
-        <option name="WX_VERSION_MAJOR"/>
-        <option name="WX_VERSION_MINOR"/>
-        <option name="WX_PORT"/>
-
-        <!-- wxwin.m4 macros will detect all WX_* options defined above -->
-
-
-        <!-- VERY IMPORTANT: <wx-lib>base</wx-lib> must be the last wx-lib tag
-                            in all your bakefiles !!
-        -->
-        <define-tag name="wx-lib" rules="exe,dll,module">
-            <if cond="value=='base'">
-                <!-- all wx-dependent libraries should have been already listed
-                     thus we can now add WX_LIBS to the linker line -->
-                <ldlibs>$(WX_LIBS)</ldlibs>
-            </if>
-            <if cond="value not in WX_LIB_LIST.split()">
-                <error>Unknown wxWidgets library given in the wx-lib tag</error>
-            </if>
-        </define-tag>
     </if>
 
-
     <!-- ============================================================== -->
     <!--                   GNU makefiles for Unix                       -->
     <!-- ============================================================== -->
 
     <if cond="FORMAT=='gnu'">
-
-        <!-- remove those WX_* vars which were created just to avoid the definition
-             of the WX_* options in wx.bkl -->
-        <unset var="WX_SHARED"/>
-        <unset var="WX_UNICODE"/>
-        <unset var="WX_DEBUG"/>
-        <unset var="WX_PORT"/>
-        <unset var="WX_VERSION"/>
-
         <set var="WX_CONFIG_DEFAULT" overwrite="0">wx-config</set>
         <option name="WX_CONFIG">
             <default-value>$(WX_CONFIG_DEFAULT)</default-value>
             <description>Location and arguments of wx-config script</description>
         </option>
-
+        <option name="WX_CFLAGS">
-        <set var="WX_PORT_DEFAULT" overwrite="0">
+            <default-value>`$(DOLLAR)(WX_CONFIG) --cflags`</default-value>
-            $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+            <description>C flags to use with wxWidgets code</description>
-        </set>
-        <option name="WX_PORT">
-            <values>gtk1,gtk2,msw,x11,motif,mgl,mac,dfb</values>
-            <default-value force="1">$(WX_PORT_DEFAULT)</default-value>
-            <description>
-                Port of the wx library to build against
-            </description>
         </option>
-
+        <option name="WX_CXXFLAGS">
-        <set var="WX_SHARED_DEFAULT" overwrite="0">
+            <default-value>`$(DOLLAR)(WX_CONFIG) --cxxflags`</default-value>
-            $(DOLLAR)(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+            <description>C++ flags to use with wxWidgets code</description>
-        </set>
-        <option name="WX_SHARED">
-            <values>0,1</values>
-            <values-description>Static,DLL</values-description>
-            <default-value force="1">$(WX_SHARED_DEFAULT)</default-value>
-            <description>
-                Use DLL build of wx library to use?
-            </description>
         </option>
-
+        <option name="WX_CPPFLAGS">
-        <set var="WX_UNICODE_DEFAULT" overwrite="0">
+            <default-value>`$(DOLLAR)(WX_CONFIG) --cppflags`</default-value>
-            $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+            <description>C preprocessor flags to use with wxWidgets code</description>
-        </set>
-        <option name="WX_UNICODE">
-            <values>0,1</values>
-            <values-description>ANSI,Unicode</values-description>
-            <default-value force="1">$(WX_UNICODE_DEFAULT)</default-value>
-            <description>
-                Compile Unicode build of wxWidgets?
-            </description>
         </option>
-
+        <option name="WX_RESCOMP">
-        <set var="WX_DEBUG_DEFAULT" overwrite="0">
+            <default-value>`$(DOLLAR)(WX_CONFIG) --rescomp`</default-value>
-            $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+            <description>wxWidgets resource compiler and flags</description>
-        </set>
-        <option name="WX_DEBUG">
-            <values>0,1</values>
-            <values-description>Release,Debug</values-description>
-            <default-value force="1">$(WX_DEBUG_DEFAULT)</default-value>
-            <description>
-                Use debug build of wxWidgets (define __WXDEBUG__)?
-            </description>
         </option>
 
-        <set var="WX_VERSION_DEFAULT" overwrite="0">
-            $(DOLLAR)(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
-        </set>
-        <option name="WX_VERSION">
-            <default-value>$(WX_VERSION_DEFAULT)</default-value>
-            <description>
-                Version of the wx library to build against.
-            </description>
-        </option>
-
-        <!-- Get MAJOR and MINOR version numbers -->
-        <set var="WX_VERSION_MAJOR" make_var="1">
-            $(DOLLAR)(shell echo $(DOLLAR)(WX_VERSION) | cut -c1,1)
-        </set>
-        <set var="WX_VERSION_MINOR" make_var="1">
-            $(DOLLAR)(shell echo $(DOLLAR)(WX_VERSION) | cut -c2,2)
-        </set>
-
-
-        <!--
-            Using the GNU format creates a configurable makefile just like
-            a win32 makefile: i.e. a makefile where you can select the wanted
-            wxWidgets build using the WX_* options.
-
-            The difference with win32 makefiles is that WX_DEBUG, WX_UNICODE and
-            WX_SHARED options have a smart default value which is created using
-            the installed wx-config or the wx-config given using WX_CONFIG option
-        -->
-        <set var="WX_CONFIG_DEBUG_FLAG">
-            <if cond="WX_DEBUG=='0'">--debug=no</if>
-            <if cond="WX_DEBUG=='1'">--debug=yes</if>
-        </set>
-        <set var="WX_CONFIG_UNICODE_FLAG">
-            <if cond="WX_UNICODE=='0'">--unicode=no</if>
-            <if cond="WX_UNICODE=='1'">--unicode=yes</if>
-        </set>
-        <set var="WX_CONFIG_SHARED_FLAG">
-            <if cond="WX_SHARED=='0'">--static=yes</if>
-            <if cond="WX_SHARED=='1'">--static=no</if>
-        </set>
-        <set var="WX_CONFIG_PORT_FLAG">
-            --toolkit=$(WX_PORT)
-        </set>
-        <set var="WX_CONFIG_VERSION_FLAG">
-            --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
-        </set>
-
-        <set var="WX_CONFIG_FLAGS" make_var="1">
-            $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) 
-            $(WX_CONFIG_PORT_FLAG) $(WX_CONFIG_VERSION_FLAG)
-        </set>
-
-        <set var="WX_CFLAGS">`$(DOLLAR)(WX_CONFIG) --cflags $(WX_CONFIG_FLAGS)`</set>
-        <set var="WX_CXXFLAGS">`$(DOLLAR)(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)`</set>
-        <set var="WX_CPPFLAGS">`$(DOLLAR)(WX_CONFIG) --cppflags $(WX_CONFIG_FLAGS)`</set>
-        <set var="WX_RESCOMP">`$(DOLLAR)(WX_CONFIG) --rescomp $(WX_CONFIG_FLAGS)`</set>
-
-        <!--
-         VERY IMPORTANT: before starting to build all targets of the generated makefile,
-                         we need to check if the selected wxWidgets build exists; we do
-                         that simply creating the following target; if it fails the make
-                         program will halt with the wx-config error message...
-        -->
-        <if cond="WX_TEST_FOR_SELECTED_WXBUILD=='1'">
-            <action id="test_for_selected_wxbuild">
-                <dependency-of>all</dependency-of>
-
-                <!-- Use @ to hide to the user that we're running wx-config... -->
-                <command>@$(DOLLAR)(WX_CONFIG) $(WX_CONFIG_FLAGS)</command>
-            </action>
-        </if>
-
         <!-- we need this but the trick used in default-values above
              prevents bakefile from detecting it: -->
-        <set var="FORMAT_OUTPUT_VARIABLES" append="1">WX_CONFIG WX_VERSION</set>
+        <set var="FORMAT_OUTPUT_VARIABLES" append="1">WX_CONFIG</set>
-
-
-        <!-- VERY IMPORTANT: <wx-lib>base</wx-lib> must be the last wx-lib tag
-                            in all your bakefiles !!
-        -->
-        <define-tag name="wx-lib" rules="exe,dll,module">
-            <if cond="value=='base'">
-                <!-- all wx libraries should have been already specified, thus
-                    $(__liblist) should contain the full list... -->
-                <set var="__liblist" append="1">base</set>
-                <ldlibs>`$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs $(','.join(__liblist.split()))`</ldlibs>
-            </if>
-            <if cond="value!='base'">
-                <set var="__liblist" append="1">$(value)</set>
-            </if>
-            <if cond="value not in WX_LIB_LIST.split()">
-                <error>Unknown wxWidgets library given in the wx-lib tag</error>
-            </if>
-        </define-tag>
     </if>
 
     <!-- ============================================================== -->
@@ -263,4 +110,27 @@ Format-specific notes:
         -->
     </template>
 
+    <!-- VERY IMPORTANT: <wx-lib>base</wx-lib> must be the last wx-lib tag
+                         in all your bakefiles !!
+    -->
+    <define-tag name="wx-lib" rules="exe,dll,module">
+        <if cond="FORMAT=='autoconf' and value=='base'">
+            <!-- all wx-dependent libraries should have been already listed
+                 thus we can now add WX_LIBS to the linker line -->
+            <ldflags>$(WX_LIBS)</ldflags>
+        </if>
+        <if cond="FORMAT=='gnu' and value=='base'">
+            <!-- all wx libraries should have been already specified, thus
+                  $(__liblist) should contain the full list... -->
+            <set var="__liblist" append="1">base</set>
+            <ldflags>`$(WX_CONFIG) --libs $(','.join(__liblist.split()))`</ldflags>
+        </if>
+        <if cond="FORMAT=='gnu' and value!='base'">
+            <set var="__liblist" append="1">$(value)</set>
+        </if>
+        <if cond="value not in ALLLIB_LIST.split()">
+            <error>Unknown wxWidgets library given in the wx-lib tag</error>
+        </if>
+    </define-tag>
+
 </makefile>