This commit was manufactured by cvs2svn to create tag 'WX_2_8_0_rc1'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_8_0_rc1@43392 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])
@@ -284,7 +284,7 @@ AC_DEFUN([WX_CHECK_FUNCS],
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
-      AC_DEFINE_UNQUOTED([AS_TR_CPP([HAVE_$wx_func])])
+      AC_DEFINE_UNQUOTED([HAVE_`echo $wx_func | tr 'a-z' 'A-Z'`])
       $2
     else
       :
@@ -350,50 +350,41 @@ AC_DEFUN([WX_ARG_CACHE_FLUSH],
           mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
         ])
 
-dnl return the name of the variable to store the value of the given
-dnl WX_ARG_WITH/ENABLE option
-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
-                          AS_TR_SH(wx_cv_use_$1)='$3=yes'
+                          ac_cv_use_$1='$3=yes'
                         elif test "$withval" = no; then
-                          AS_TR_SH(wx_cv_use_$1)='$3=no'
+                          ac_cv_use_$1='$3=no'
                         elif test "$withval" = sys; then
-                          AS_TR_SH(wx_cv_use_$1)='$3=sys'
+                          ac_cv_use_$1='$3=sys'
                         elif test "$withval" = builtin; then
-                          AS_TR_SH(wx_cv_use_$1)='$3=builtin'
+                          ac_cv_use_$1='$3=builtin'
                         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"
-                            cache=yes
+                          eval "DEFAULT_$LINE"
                         else
-                            cache=no
+                          no_cache=1
                         fi
 
-                        AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$wxUSE_ALL_FEATURES}"
+                        ac_cv_use_$1='$3='$DEFAULT_$3
                       ])
 
-          eval "$AS_TR_SH(wx_cv_use_$1)"
-          if test "x$cache" = xyes; then
-            echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
+          eval "$ac_cv_use_$1"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$$3" = yes; then
@@ -414,125 +405,81 @@ 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
-                          AS_TR_SH(wx_cv_use_$1)='$3=yes'
+                          ac_cv_use_$1='$3=yes'
                         else
-                          AS_TR_SH(wx_cv_use_$1)='$3=no'
+                          ac_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"
-                            cache=yes
+                          eval "DEFAULT_$LINE"
                         else
-                            cache=no
+                          no_cache=1
                         fi
 
-                        AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
+                        ac_cv_use_$1='$3='$DEFAULT_$3
                       ])
 
-          eval "$AS_TR_SH(wx_cv_use_$1)"
-          if test "x$cache" = xyes; then
-            echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
+          eval "$ac_cv_use_$1"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test x"$withstring" = xwithout; then
-            if test $$3 = yes; then
-              result=no
-            else
-              result=yes
-            fi
+          if test "$$3" = yes; then
+            AC_MSG_RESULT(yes)
           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 show "checking for --disable-foo" message when running configure instead of
-dnl the default "checking for --enable-foo" one whih is useful for the options
-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
+dnl enablestring is a hack and allows to show "checking for --disable-foo"
+dnl message when running configure instead of the default "checking for
+dnl --enable-foo" one whih is useful for the options enabled by default
 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
-                            AS_TR_SH(wx_cv_use_$1)='$3=yes'
+                            ac_cv_use_$1='$3=yes'
                           else
-                            AS_TR_SH(wx_cv_use_$1)='$3=no'
+                            ac_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"
-                              cache=yes
+                            eval "DEFAULT_$LINE"
                           else
-                              cache=no
+                            no_cache=1
                           fi
 
-                          AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
+                          ac_cv_use_$1='$3='$DEFAULT_$3
                         ])
 
-          eval "$AS_TR_SH(wx_cv_use_$1)"
-          if test "x$cache" = xyes; then
-            echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
+          eval "$ac_cv_use_$1"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test x"$enablestring" = xdisable; then
-            if test $$3 = yes; then
-              result=no
-            else
-              result=yes
-            fi
+          if test "$$3" = yes; then
+            AC_MSG_RESULT(yes)
           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 +492,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                     wxUSE_FOO=$DEFAULT_wxUSE_FOO
+dnl  <not given>        value from configarg.cache or wxUSE_FOO=no
 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
-            echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_$1 >> ${wx_arg_cache_file}.tmp
           fi
 
           AC_MSG_RESULT([$$3])

aclocal.m4

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,10 +11,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # 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])
 m4_include([build/aclocal/bakefile.m4])
 m4_include([build/aclocal/cppunit.m4])
@@ -22,5 +18,6 @@ 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([build/aclocal/ax_func_which_gethostbyname_r.m4])
+m4_include([build/aclocal/ac_raf_func_which_getservbyname_r.m4])
 m4_include([acinclude.m4])

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-dllar.m4

@@ -1,483 +0,0 @@
-AC_DEFUN([AC_BAKEFILE_CREATE_FILE_DLLAR_SH],
-[
-dnl ===================== dllar.sh begins here =====================
-dnl    (Created by merge-scripts.py from dllar.sh
-dnl     file do not edit here!)
-D='$'
-cat <<EOF >dllar.sh
-#!/bin/sh
-#
-# dllar - a tool to build both a .dll and an .a file
-# from a set of object (.o) files for EMX/OS2.
-#
-#  Written by Andrew Zabolotny, bit@freya.etu.ru
-#  Ported to Unix like shell by Stefan Neis, Stefan.Neis@t-online.de
-#
-#  This script will accept a set of files on the command line.
-#  All the public symbols from the .o files will be exported into
-#  a .DEF file, then linker will be run (through gcc) against them to
-#  build a shared library consisting of all given .o files. All libraries
-#  (.a) will be first decompressed into component .o files then act as
-#  described above. You can optionally give a description (-d "description")
-#  which will be put into .DLL. To see the list of accepted options (as well
-#  as command-line format) simply run this program without options. The .DLL
-#  is built to be imported by name (there is no guarantee that new versions
-#  of the library you build will have same ordinals for same symbols).
-#
-#  dllar is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  dllar is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with dllar; see the file COPYING.  If not, write to the Free
-#  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-#  02111-1307, USA.
-
-# To successfuly run this program you will need:
-#  - Current drive should have LFN support (HPFS, ext2, network, etc)
-#    (Sometimes dllar generates filenames which won't fit 8.3 scheme)
-#  - gcc
-#    (used to build the .dll)
-#  - emxexp
-#    (used to create .def file from .o files)
-#  - emximp
-#    (used to create .a file from .def file)
-#  - GNU text utilites (cat, sort, uniq)
-#    used to process emxexp output
-#  - GNU file utilities (mv, rm)
-#  - GNU sed
-#  - lxlite (optional, see flag below)
-#    (used for general .dll cleanup)
-#
-
-flag_USE_LXLITE=1;
-
-#
-# helper functions
-# basnam, variant of basename, which does _not_ remove the path, _iff_
-#                              second argument (suffix to remove) is given
-basnam(){
-    case ${D}# in
-    1)
-        echo ${D}1 | sed 's/.*\\///' | sed 's/.*\\\\//'
-        ;;
-    2)
-        echo ${D}1 | sed 's/'${D}2'${D}//'
-        ;;
-    *)
-        echo "error in basnam ${D}*"
-        exit 8
-        ;;
-    esac
-}
-
-# Cleanup temporary files and output
-CleanUp() {
-    cd ${D}curDir
-    for i in ${D}inputFiles ; do
-        case ${D}i in
-        *!)
-            rm -rf \`basnam ${D}i !\`
-            ;;
-        *)
-            ;;
-        esac
-    done
-
-    # Kill result in case of failure as there is just to many stupid make/nmake
-    # things out there which doesn't do this.
-    if @<:@ ${D}# -eq 0 @:>@; then
-        rm -f ${D}arcFile ${D}arcFile2 ${D}defFile ${D}dllFile
-    fi
-}
-
-# Print usage and exit script with rc=1.
-PrintHelp() {
- echo 'Usage: dllar.sh @<:@-o@<:@utput@:>@ output_file@:>@ @<:@-i@<:@mport@:>@ importlib_name@:>@'
- echo '       @<:@-name-mangler-script script.sh@:>@'
- echo '       @<:@-d@<:@escription@:>@ "dll descrption"@:>@ @<:@-cc "CC"@:>@ @<:@-f@<:@lags@:>@ "CFLAGS"@:>@'
- echo '       @<:@-ord@<:@inals@:>@@:>@ -ex@<:@clude@:>@ "symbol(s)"'
- echo '       @<:@-libf@<:@lags@:>@ "{INIT|TERM}{GLOBAL|INSTANCE}"@:>@ @<:@-nocrt@<:@dll@:>@@:>@ @<:@-nolxl@<:@ite@:>@@:>@'
- echo '       @<:@*.o@:>@ @<:@*.a@:>@'
- echo '*> "output_file" should have no extension.'
- echo '   If it has the .o, .a or .dll extension, it is automatically removed.'
- echo '   The import library name is derived from this and is set to "name".a,'
- echo '   unless overridden by -import'
- echo '*> "importlib_name" should have no extension.'
- echo '   If it has the .o, or .a extension, it is automatically removed.'
- echo '   This name is used as the import library name and may be longer and'
- echo '   more descriptive than the DLL name which has to follow the old '
- echo '   8.3 convention of FAT.'
- echo '*> "script.sh may be given to override the output_file name by a'
- echo '   different name. It is mainly useful if the regular make process'
- echo '   of some package does not take into account OS/2 restriction of'
- echo '   DLL name lengths. It takes the importlib name as input and is'
- echo '   supposed to procude a shorter name as output. The script should'
- echo '   expect to get importlib_name without extension and should produce'
- echo '   a (max.) 8 letter name without extension.'
- echo '*> "cc" is used to use another GCC executable.   (default: gcc.exe)'
- echo '*> "flags" should be any set of valid GCC flags. (default: -s -Zcrtdll)'
- echo '   These flags will be put at the start of GCC command line.'
- echo '*> -ord@<:@inals@:>@ tells dllar to export entries by ordinals. Be careful.'
- echo '*> -ex@<:@clude@:>@ defines symbols which will not be exported. You can define'
- echo '   multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*".'
- echo '   If the last character of a symbol is "*", all symbols beginning'
- echo '   with the prefix before "*" will be exclude, (see _GLOBAL* above).'
- echo '*> -libf@<:@lags@:>@ can be used to add INITGLOBAL/INITINSTANCE and/or'
- echo '   TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library.'
- echo '*> -nocrt@<:@dll@:>@ switch will disable linking the library against emx''s'
- echo '   C runtime DLLs.'
- echo '*> -nolxl@<:@ite@:>@ switch will disable running lxlite on the resulting DLL.'
- echo '*> All other switches (for example -L./ or -lmylib) will be passed'
- echo '   unchanged to GCC at the end of command line.'
- echo '*> If you create a DLL from a library and you do not specify -o,'
- echo '   the basename for DLL and import library will be set to library name,'
- echo '   the initial library will be renamed to 'name'_s.a (_s for static)'
- echo '   i.e. "dllar gcc.a" will create gcc.dll and gcc.a, and the initial'
- echo '   library will be renamed into gcc_s.a.'
- echo '--------'
- echo 'Example:'
- echo '   dllar -o gcc290.dll libgcc.a -d "GNU C runtime library" -ord'
- echo '    -ex "__main __ctordtor*" -libf "INITINSTANCE TERMINSTANCE"'
- CleanUp
- exit 1
-}
-
-# Execute a command.
-# If exit code of the commnad <> 0 CleanUp() is called and we'll exit the script.
-# @Uses    Whatever CleanUp() uses.
-doCommand() {
-    echo "${D}*"
-    eval ${D}*
-    rcCmd=${D}?
-
-    if @<:@ ${D}rcCmd -ne 0 @:>@; then
-        echo "command failed, exit code="${D}rcCmd
-        CleanUp
-        exit ${D}rcCmd
-    fi
-}
-
-# main routine
-# setup globals
-cmdLine=${D}*
-outFile=""
-outimpFile=""
-inputFiles=""
-renameScript=""
-description=""
-CC=gcc.exe
-CFLAGS="-s -Zcrtdll"
-EXTRA_CFLAGS=""
-EXPORT_BY_ORDINALS=0
-exclude_symbols=""
-library_flags=""
-curDir=\`pwd\`
-curDirS=curDir
-case ${D}curDirS in
-*/)
-  ;;
-*)
-  curDirS=${D}{curDirS}"/"
-  ;;
-esac
-# Parse commandline
-libsToLink=0
-omfLinking=0
-while @<:@ ${D}1 @:>@; do
-    case ${D}1 in
-    -ord*)
-        EXPORT_BY_ORDINALS=1;
-        ;;
-    -o*)
-	shift
-        outFile=${D}1
-	;;
-    -i*)
-        shift
-        outimpFile=${D}1
-        ;;
-    -name-mangler-script)
-        shift
-        renameScript=${D}1
-        ;;
-    -d*)
-        shift
-        description=${D}1
-        ;;
-    -f*)
-        shift
-        CFLAGS=${D}1
-        ;;
-    -c*)
-        shift
-        CC=${D}1
-        ;;
-    -h*)
-        PrintHelp
-        ;;
-    -ex*)
-        shift
-        exclude_symbols=${D}{exclude_symbols}${D}1" "
-        ;;
-    -libf*)
-        shift
-        library_flags=${D}{library_flags}${D}1" "
-        ;;
-    -nocrt*)
-        CFLAGS="-s"
-        ;;
-    -nolxl*)
-        flag_USE_LXLITE=0
-        ;;
-    -* | /*)
-        case ${D}1 in
-        -L* | -l*)
-            libsToLink=1
-            ;;
-        -Zomf)
-            omfLinking=1
-            ;;
-        *)
-            ;;
-        esac
-        EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
-        ;;
-    *.dll)
-        EXTRA_CFLAGS="${D}{EXTRA_CFLAGS} \`basnam ${D}1 .dll\`"
-        if @<:@ ${D}omfLinking -eq 1 @:>@; then
-            EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.lib"
-	else
-            EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.a"
-        fi
-        ;;
-    *)
-        found=0;
-        if @<:@ ${D}libsToLink -ne 0 @:>@; then
-            EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
-        else
-            for file in ${D}1 ; do
-                if @<:@ -f ${D}file @:>@; then
-                    inputFiles="${D}{inputFiles} ${D}file"
-                    found=1
-                fi
-            done
-            if @<:@ ${D}found -eq 0 @:>@; then
-                echo "ERROR: No file(s) found: "${D}1
-                exit 8
-            fi
-        fi
-      ;;
-    esac
-    shift
-done # iterate cmdline words
-
-#
-if @<:@ -z "${D}inputFiles" @:>@; then
-    echo "dllar: no input files"
-    PrintHelp
-fi
-
-# Now extract all .o files from .a files
-newInputFiles=""
-for file in ${D}inputFiles ; do
-    case ${D}file in
-    *.a | *.lib)
-        case ${D}file in
-        *.a)
-            suffix=".a"
-            AR="ar"
-            ;;
-        *.lib)
-            suffix=".lib"
-            AR="emxomfar"
-            EXTRA_CFLAGS="${D}EXTRA_CFLAGS -Zomf"
-            ;;
-        *)
-            ;;
-        esac
-        dirname=\`basnam ${D}file ${D}suffix\`"_%"
-        mkdir ${D}dirname
-        if @<:@ ${D}? -ne 0 @:>@; then
-            echo "Failed to create subdirectory ./${D}dirname"
-            CleanUp
-            exit 8;
-        fi
-        # Append '!' to indicate archive
-        newInputFiles="${D}newInputFiles ${D}{dirname}!"
-        doCommand "cd ${D}dirname; ${D}AR x ../${D}file"
-        cd ${D}curDir
-        found=0;
-        for subfile in ${D}dirname/*.o* ; do
-            if @<:@ -f ${D}subfile @:>@; then
-                found=1
-                if @<:@ -s ${D}subfile @:>@; then
-	            # FIXME: This should be: is file size > 32 byte, _not_ > 0!
-                    newInputFiles="${D}newInputFiles ${D}subfile"
-                fi
-            fi
-        done
-        if @<:@ ${D}found -eq 0 @:>@; then
-            echo "WARNING: there are no files in archive \\'${D}file\\'"
-        fi
-        ;;
-    *)
-        newInputFiles="${D}{newInputFiles} ${D}file"
-        ;;
-    esac
-done
-inputFiles="${D}newInputFiles"
-
-# Output filename(s).
-do_backup=0;
-if @<:@ -z ${D}outFile @:>@; then
-    do_backup=1;
-    set outFile ${D}inputFiles; outFile=${D}2
-fi
-
-# If it is an archive, remove the '!' and the '_%' suffixes
-case ${D}outFile in
-*_%!)
-    outFile=\`basnam ${D}outFile _%!\`
-    ;;
-*)
-    ;;
-esac
-case ${D}outFile in
-*.dll)
-    outFile=\`basnam ${D}outFile .dll\`
-    ;;
-*.DLL)
-    outFile=\`basnam ${D}outFile .DLL\`
-    ;;
-*.o)
-    outFile=\`basnam ${D}outFile .o\`
-    ;;
-*.obj)
-    outFile=\`basnam ${D}outFile .obj\`
-    ;;
-*.a)
-    outFile=\`basnam ${D}outFile .a\`
-    ;;
-*.lib)
-    outFile=\`basnam ${D}outFile .lib\`
-    ;;
-*)
-    ;;
-esac
-case ${D}outimpFile in
-*.a)
-    outimpFile=\`basnam ${D}outimpFile .a\`
-    ;;
-*.lib)
-    outimpFile=\`basnam ${D}outimpFile .lib\`
-    ;;
-*)
-    ;;
-esac
-if @<:@ -z ${D}outimpFile @:>@; then
-    outimpFile=${D}outFile
-fi
-defFile="${D}{outFile}.def"
-arcFile="${D}{outimpFile}.a"
-arcFile2="${D}{outimpFile}.lib"
-
-#create ${D}dllFile as something matching 8.3 restrictions,
-if @<:@ -z ${D}renameScript @:>@ ; then
-    dllFile="${D}outFile"
-else
-    dllFile=\`${D}renameScript ${D}outimpFile\`
-fi
-
-if @<:@ ${D}do_backup -ne 0 @:>@ ; then
-    if @<:@ -f ${D}arcFile @:>@ ; then
-        doCommand "mv ${D}arcFile ${D}{outFile}_s.a"
-    fi
-    if @<:@ -f ${D}arcFile2 @:>@ ; then
-        doCommand "mv ${D}arcFile2 ${D}{outFile}_s.lib"
-    fi
-fi
-
-# Extract public symbols from all the object files.
-tmpdefFile=${D}{defFile}_%
-rm -f ${D}tmpdefFile
-for file in ${D}inputFiles ; do
-    case ${D}file in
-    *!)
-        ;;
-    *)
-        doCommand "emxexp -u ${D}file >> ${D}tmpdefFile"
-        ;;
-    esac
-done
-
-# Create the def file.
-rm -f ${D}defFile
-echo "LIBRARY \`basnam ${D}dllFile\` ${D}library_flags" >> ${D}defFile
-dllFile="${D}{dllFile}.dll"
-if @<:@ ! -z ${D}description @:>@; then
-    echo "DESCRIPTION  \\"${D}{description}\\"" >> ${D}defFile
-fi
-echo "EXPORTS" >> ${D}defFile
-
-doCommand "cat ${D}tmpdefFile | sort.exe | uniq.exe > ${D}{tmpdefFile}%"
-grep -v "^ *;" < ${D}{tmpdefFile}% | grep -v "^ *${D}" >${D}tmpdefFile
-
-# Checks if the export is ok or not.
-for word in ${D}exclude_symbols; do
-    grep -v ${D}word < ${D}tmpdefFile >${D}{tmpdefFile}%
-    mv ${D}{tmpdefFile}% ${D}tmpdefFile
-done
-
-
-if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
-    sed "=" < ${D}tmpdefFile | \\
-    sed '
-      N
-      : loop
-      s/^\\(@<:@0-9@:>@\\+\\)\\(@<:@^;@:>@*\\)\\(;.*\\)\\?/\\2 @\\1 NONAME/
-      t loop
-    ' > ${D}{tmpdefFile}%
-    grep -v "^ *${D}" < ${D}{tmpdefFile}% > ${D}tmpdefFile
-else
-    rm -f ${D}{tmpdefFile}%
-fi
-cat ${D}tmpdefFile >> ${D}defFile
-rm -f ${D}tmpdefFile
-
-# Do linking, create implib, and apply lxlite.
-gccCmdl="";
-for file in ${D}inputFiles ; do
-    case ${D}file in
-    *!)
-        ;;
-    *)
-        gccCmdl="${D}gccCmdl ${D}file"
-        ;;
-    esac
-done
-doCommand "${D}CC ${D}CFLAGS -Zdll -o ${D}dllFile ${D}defFile ${D}gccCmdl ${D}EXTRA_CFLAGS"
-touch "${D}{outFile}.dll"
-
-doCommand "emximp -o ${D}arcFile ${D}defFile"
-if @<:@ ${D}flag_USE_LXLITE -ne 0 @:>@; then
-    add_flags="";
-    if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
-        add_flags="-ynd"
-    fi
-    doCommand "lxlite -cs -t: -mrn -mln ${D}add_flags ${D}dllFile"
-fi
-doCommand "emxomf -s -l ${D}arcFile"
-
-# Successful exit.
-CleanUp 1
-exit 0
-EOF
-dnl ===================== dllar.sh ends here =====================
-])

build/aclocal/bakefile-lang.m4

@@ -1,36 +1,74 @@
-dnl
-dnl  This file is part of Bakefile (http://www.bakefile.org)
-dnl
-dnl  Copyright (C) 2003-2007 Vaclav Slavik, David Elliott and others
-dnl
-dnl  Permission is hereby granted, free of charge, to any person obtaining a
-dnl  copy of this software and associated documentation files (the "Software"),
-dnl  to deal in the Software without restriction, including without limitation
-dnl  the rights to use, copy, modify, merge, publish, distribute, sublicense,
-dnl  and/or sell copies of the Software, and to permit persons to whom the
-dnl  Software is furnished to do so, subject to the following conditions:
-dnl
-dnl  The above copyright notice and this permission notice shall be included in
-dnl  all copies or substantial portions of the Software.
-dnl
-dnl  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-dnl  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-dnl  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-dnl  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-dnl  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-dnl  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-dnl  DEALINGS IN THE SOFTWARE.
-dnl
-dnl  $Id$
-dnl
-dnl  Compiler detection macros by David Elliott and Vadim Zeitlin
-dnl
+dnl ---------------------------------------------------------------------------
+dnl Compiler detection macros by David Elliott
+dnl ---------------------------------------------------------------------------
 
 
 dnl ===========================================================================
-dnl Macros to detect different C/C++ compilers
+dnl Macros to detect non-GNU compilers (MetroWerks, XLC)
 dnl ===========================================================================
 
+dnl Based on autoconf _AC_LANG_COMPILER_GNU
+AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_MWERKS],
+[AC_CACHE_CHECK([whether we are using the Metrowerks _AC_LANG compiler],
+    [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks],
+    [AC_TRY_COMPILE([],[#ifndef __MWERKS__
+       choke me
+#endif
+],
+        [bakefile_compiler_mwerks=yes],
+        [bakefile_compiler_mwerks=no])
+    bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks=$bakefile_compiler_mwerks
+    ])
+])
+
+dnl Loosely based on autoconf AC_PROG_CC
+dnl TODO: Maybe this should wrap the call to AC_PROG_CC and be used instead.
+AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
+[AC_LANG_PUSH(C)
+_AC_BAKEFILE_LANG_COMPILER_MWERKS
+MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes`
+AC_LANG_POP(C)
+])
+
+dnl Loosely based on autoconf AC_PROG_CXX
+dnl TODO: Maybe this should wrap the call to AC_PROG_CXX and be used instead.
+AC_DEFUN([AC_BAKEFILE_PROG_MWCXX],
+[AC_LANG_PUSH(C++)
+_AC_BAKEFILE_LANG_COMPILER_MWERKS
+MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes`
+AC_LANG_POP(C++)
+])
+
+dnl Based on autoconf _AC_LANG_COMPILER_GNU
+AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_XLC],
+[AC_CACHE_CHECK([whether we are using the IBM xlC _AC_LANG compiler],
+    [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc],
+    [AC_TRY_COMPILE([],[#ifndef __xlC__
+       choke me
+#endif
+],
+        [bakefile_compiler_xlc=yes],
+        [bakefile_compiler_xlc=no])
+    bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc=$bakefile_compiler_xlc
+    ])
+])
+
+dnl Loosely based on autoconf AC_PROG_CC
+AC_DEFUN([AC_BAKEFILE_PROG_XLCC],
+[AC_LANG_PUSH(C)
+_AC_BAKEFILE_LANG_COMPILER_XLC
+XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes`
+AC_LANG_POP(C)
+])
+
+dnl Loosely based on autoconf AC_PROG_CXX
+AC_DEFUN([AC_BAKEFILE_PROG_XLCXX],
+[AC_LANG_PUSH(C++)
+_AC_BAKEFILE_LANG_COMPILER_XLC
+XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes`
+AC_LANG_POP(C++)
+])
+
 dnl Based on autoconf _AC_LANG_COMPILER_GNU
 dnl _AC_BAKEFILE_LANG_COMPILER(NAME, LANG, SYMBOL, IF-YES, IF-NO)
 AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
@@ -51,34 +89,12 @@ AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
          )
         ]
     )
+    AC_LANG_POP($2)
     if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3" = "xyes"; then
         :; $4
     else
         :; $5
     fi
-    AC_LANG_POP($2)
-])
-
-dnl CodeWarrior Metrowerks compiler defines __MWERKS__ for both C and C++
-AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
-[
-    _AC_BAKEFILE_LANG_COMPILER(Metrowerks, C, __MWERKS__, MWCC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_MWCXX],
-[
-    _AC_BAKEFILE_LANG_COMPILER(Metrowerks, C++, __MWERKS__, MWCXX=yes)
-])
-
-dnl IBM xlC compiler defines __xlC__ for both C and C++
-AC_DEFUN([AC_BAKEFILE_PROG_XLCC],
-[
-    _AC_BAKEFILE_LANG_COMPILER([IBM xlC], C, __xlC__, XLCC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_XLCXX],
-[
-    _AC_BAKEFILE_LANG_COMPILER([IBM xlC], C++, __xlC__, XLCXX=yes)
 ])
 
 dnl recent versions of SGI mipsPro compiler define _SGI_COMPILER_VERSION
@@ -188,12 +204,7 @@ dnl _AC_BAKEFILE_PROG_COMPILER(LANG)
 AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
 [
     AC_PROG_$1
-
-    dnl Intel compiler can be used under several different OS and even
-    dnl different architectures (x86, amd64 and Itanium) so it's easier to just
-    dnl always test for it
     AC_BAKEFILE_PROG_INTEL$1
-
     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
@@ -220,11 +231,6 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
                 AC_BAKEFILE_PROG_SGI$1
                 ;;
 
-            Linux*)
-                dnl Sun CC is now available under Linux too
-                AC_BAKEFILE_PROG_SUN$1
-                ;;
-
             HP-UX*)
                 AC_BAKEFILE_PROG_HP$1
                 ;;

build/aclocal/bakefile.m4

@@ -1,36 +1,9 @@
-dnl
-dnl  This file is part of Bakefile (http://bakefile.sourceforge.net)
-dnl
-dnl  Copyright (C) 2003-2007 Vaclav Slavik and others
-dnl
-dnl  Permission is hereby granted, free of charge, to any person obtaining a
-dnl  copy of this software and associated documentation files (the "Software"),
-dnl  to deal in the Software without restriction, including without limitation
-dnl  the rights to use, copy, modify, merge, publish, distribute, sublicense,
-dnl  and/or sell copies of the Software, and to permit persons to whom the
-dnl  Software is furnished to do so, subject to the following conditions:
-dnl
-dnl  The above copyright notice and this permission notice shall be included in
-dnl  all copies or substantial portions of the Software.
-dnl
-dnl  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-dnl  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-dnl  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-dnl  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-dnl  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-dnl  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-dnl  DEALINGS IN THE SOFTWARE.
-dnl
-dnl  $Id$
-dnl
-dnl  Support macros for makefiles generated by BAKEFILE.
-dnl
-
-
 dnl ---------------------------------------------------------------------------
+dnl Support macros for makefiles generated by BAKEFILE.
+dnl ---------------------------------------------------------------------------
+
 dnl Lots of compiler & linker detection code contained here was taken from
-dnl wxWidgets configure.in script (see http://www.wxwidgets.org)
-dnl ---------------------------------------------------------------------------
+dnl wxWindows configure.in script (see http://www.wxwindows.org)
 
 
 
@@ -78,7 +51,7 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
     PLATFORM_OS2=0
     PLATFORM_BEOS=0
 
-    if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then
+    if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then 
         case "${BAKEFILE_HOST}" in
             *-*-mingw32* )
                 PLATFORM_WIN32=1
@@ -92,7 +65,7 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
             *-*-darwin* )
                 PLATFORM_MAC=1
                 PLATFORM_MACOSX=1
-            ;;
+            ;; 
             *-*-beos* )
                 PLATFORM_BEOS=1
             ;;
@@ -126,8 +99,7 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
                 PLATFORM_BEOS=1
             ;;
             * )
-                dnl wxWidgets-specific: allow unknown Unix systems
-                dnl AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
+                AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
             ;;
         esac
     fi
@@ -154,7 +126,7 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM_SPECIFICS],
     AC_ARG_ENABLE([omf], AS_HELP_STRING([--enable-omf],
                                         [use OMF object format (OS/2)]),
                   [bk_os2_use_omf="$enableval"])
-
+    
     case "${BAKEFILE_HOST}" in
       *-*-darwin* )
         dnl For Unix to MacOS X porting instructions, see:
@@ -181,7 +153,7 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM_SPECIFICS],
             OS2_LIBEXT="a"
         fi
         ;;
-
+      
       i*86-*-beos* )
         LDFLAGS="-L/boot/develop/lib/x86 $LDFLAGS"
         ;;
@@ -206,7 +178,7 @@ AC_DEFUN([AC_BAKEFILE_SUFFIXES],
     DLLPREFIX_MODULE=""
     DLLIMP_SUFFIX=""
     dlldir="$libdir"
-
+    
     case "${BAKEFILE_HOST}" in
         *-hp-hpux* )
             SO_SUFFIX="sl"
@@ -289,7 +261,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
         dnl the switch for gcc is the same under all platforms
         PIC_FLAG="-fPIC"
     fi
-
+    
     dnl Defaults for GCC and ELF .so shared libs:
     SHARED_LD_CC="\$(CC) -shared ${PIC_FLAG} -o"
     SHARED_LD_CXX="\$(CXX) -shared ${PIC_FLAG} -o"
@@ -309,17 +281,27 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
       ;;
 
       *-*-linux* )
-        if test "$INTELCC" = "yes"; then
-            PIC_FLAG="-KPIC"
-        elif test "x$SUNCXX" = "xyes"; then
-            SHARED_LD_CC="${CC} -G -o"
-            SHARED_LD_CXX="${CXX} -G -o"
-            PIC_FLAG="-KPIC"
+        if test "x$GCC" != "xyes"; then
+            AC_CACHE_CHECK([for Intel compiler], bakefile_cv_prog_icc,
+            [
+                AC_TRY_COMPILE([],
+                    [
+                        #ifndef __INTEL_COMPILER
+                        This is not ICC
+                        #endif
+                    ],
+                    bakefile_cv_prog_icc=yes,
+                    bakefile_cv_prog_icc=no
+                )
+            ])
+            if test "$bakefile_cv_prog_icc" = "yes"; then
+                PIC_FLAG="-KPIC"
+            fi
         fi
       ;;
 
       *-*-solaris2* )
-        if test "x$SUNCXX" = xyes ; then
+        if test "x$GCC" != xyes ; then
             SHARED_LD_CC="${CC} -G -o"
             SHARED_LD_CXX="${CXX} -G -o"
             PIC_FLAG="-KPIC"
@@ -449,7 +431,8 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
       ;;
 
       *)
-        AC_MSG_ERROR(unknown system type $BAKEFILE_HOST.)
+        dnl wxWidgets-specific: allow unknown Unix systems
+        dnl AC_MSG_ERROR(unknown system type $BAKEFILE_HOST.)
     esac
 
     if test "x$PIC_FLAG" != "x" ; then
@@ -490,11 +473,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
 
     case "${BAKEFILE_HOST}" in
       *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu )
-        if test "x$SUNCXX" = "xyes"; then
-            SONAME_FLAG="-h "
-        else
-            SONAME_FLAG="-Wl,-soname,"
-        fi
+        SONAME_FLAG="-Wl,-soname,"
         USE_SOVERSION=1
         USE_SOVERLINUX=1
         USE_SOSYMLINKS=1
@@ -541,7 +520,7 @@ AC_DEFUN([AC_BAKEFILE_DEPS],
                   AS_HELP_STRING([--disable-dependency-tracking],
                                  [don't use dependency tracking even if the compiler can]),
                   [bk_use_trackdeps="$enableval"])
-
+    
     AC_MSG_CHECKING([for dependency tracking method])
 
     BK_DEPS=""
@@ -617,19 +596,14 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
 
     AC_PROG_MAKE_SET
     AC_SUBST(MAKE_SET)
-
+    
     if test "x$SUNCXX" = "xyes"; then
         dnl Sun C++ compiler requires special way of creating static libs;
         dnl see here for more details:
         dnl https://sourceforge.net/tracker/?func=detail&atid=109863&aid=1229751&group_id=9863
         AR=$CXX
+        AC_SUBST(AR)
         AROPTIONS="-xar -o"
-        AC_SUBST(AR)
-    elif test "x$SGICC" = "xyes"; then
-        dnl Almost the same as above for SGI mipsPro compiler
-        AR=$CXX
-        AROPTIONS="-ar -o"
-        AC_SUBST(AR)
     else
         AC_CHECK_TOOL(AR, ar, ar)
         AROPTIONS=rcu
@@ -670,12 +644,12 @@ dnl ---------------------------------------------------------------------------
 
 AC_DEFUN([AC_BAKEFILE_RES_COMPILERS],
 [
-    case ${BAKEFILE_HOST} in
+    case ${BAKEFILE_HOST} in 
         *-*-cygwin* | *-*-mingw32* )
             dnl Check for win32 resources compiler:
             AC_CHECK_TOOL(WINDRES, windres)
          ;;
-
+ 
       *-*-darwin* | powerpc-apple-macos* )
             AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez)
             AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
@@ -706,7 +680,7 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
     USE_PCH=0
     BK_MAKE_PCH=""
 
-    case ${BAKEFILE_HOST} in
+    case ${BAKEFILE_HOST} in 
         *-*-cygwin* )
             dnl PCH support is broken in cygwin gcc because of unportable
             dnl assumptions about mmap() in gcc code which make PCH generation
@@ -818,25 +792,509 @@ AC_DEFUN([AC_BAKEFILE],
     AC_BAKEFILE_DEPS
     AC_BAKEFILE_RES_COMPILERS
 
-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.2"
-
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.1"
+   
     dnl includes autoconf_inc.m4:
     $1
-
+    
     if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then
         AC_MSG_ERROR([No version found in autoconf_inc.m4 - bakefile macro was changed to take additional argument, perhaps configure.in wasn't updated (see the documentation)?])
     fi
-
+    
     if test "$BAKEFILE_BAKEFILE_M4_VERSION" != "$BAKEFILE_AUTOCONF_INC_M4_VERSION" ; then
         AC_MSG_ERROR([Versions of Bakefile used to generate makefiles ($BAKEFILE_AUTOCONF_INC_M4_VERSION) and configure ($BAKEFILE_BAKEFILE_M4_VERSION) do not match.])
     fi
 ])
-
+        
 
 dnl ---------------------------------------------------------------------------
 dnl              Embedded copies of helper scripts follow:
 dnl ---------------------------------------------------------------------------
 
+AC_DEFUN([AC_BAKEFILE_CREATE_FILE_DLLAR_SH],
+[
+dnl ===================== dllar.sh begins here =====================
+dnl    (Created by merge-scripts.py from dllar.sh
+dnl     file do not edit here!)
+D='$'
+cat <<EOF >dllar.sh
+#!/bin/sh
+#
+# dllar - a tool to build both a .dll and an .a file
+# from a set of object (.o) files for EMX/OS2.
+#
+#  Written by Andrew Zabolotny, bit@freya.etu.ru
+#  Ported to Unix like shell by Stefan Neis, Stefan.Neis@t-online.de
+#
+#  This script will accept a set of files on the command line.
+#  All the public symbols from the .o files will be exported into
+#  a .DEF file, then linker will be run (through gcc) against them to
+#  build a shared library consisting of all given .o files. All libraries
+#  (.a) will be first decompressed into component .o files then act as
+#  described above. You can optionally give a description (-d "description")
+#  which will be put into .DLL. To see the list of accepted options (as well
+#  as command-line format) simply run this program without options. The .DLL
+#  is built to be imported by name (there is no guarantee that new versions
+#  of the library you build will have same ordinals for same symbols).
+#
+#  dllar is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  dllar is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with dllar; see the file COPYING.  If not, write to the Free
+#  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+#  02111-1307, USA.
+
+# To successfuly run this program you will need:
+#  - Current drive should have LFN support (HPFS, ext2, network, etc)
+#    (Sometimes dllar generates filenames which won't fit 8.3 scheme)
+#  - gcc
+#    (used to build the .dll)
+#  - emxexp
+#    (used to create .def file from .o files)
+#  - emximp
+#    (used to create .a file from .def file)
+#  - GNU text utilites (cat, sort, uniq)
+#    used to process emxexp output
+#  - GNU file utilities (mv, rm)
+#  - GNU sed
+#  - lxlite (optional, see flag below)
+#    (used for general .dll cleanup)
+#
+
+flag_USE_LXLITE=1;
+
+#
+# helper functions
+# basnam, variant of basename, which does _not_ remove the path, _iff_
+#                              second argument (suffix to remove) is given
+basnam(){
+    case ${D}# in
+    1)
+        echo ${D}1 | sed 's/.*\\///' | sed 's/.*\\\\//'
+        ;;
+    2)
+        echo ${D}1 | sed 's/'${D}2'${D}//'
+        ;;
+    *)
+        echo "error in basnam ${D}*"
+        exit 8
+        ;;
+    esac
+}
+
+# Cleanup temporary files and output
+CleanUp() {
+    cd ${D}curDir
+    for i in ${D}inputFiles ; do
+        case ${D}i in
+        *!)
+            rm -rf \`basnam ${D}i !\`
+            ;;
+        *)
+            ;;
+        esac
+    done
+
+    # Kill result in case of failure as there is just to many stupid make/nmake
+    # things out there which doesn't do this.
+    if @<:@ ${D}# -eq 0 @:>@; then
+        rm -f ${D}arcFile ${D}arcFile2 ${D}defFile ${D}dllFile
+    fi
+}
+
+# Print usage and exit script with rc=1.
+PrintHelp() {
+ echo 'Usage: dllar.sh @<:@-o@<:@utput@:>@ output_file@:>@ @<:@-i@<:@mport@:>@ importlib_name@:>@'
+ echo '       @<:@-name-mangler-script script.sh@:>@'
+ echo '       @<:@-d@<:@escription@:>@ "dll descrption"@:>@ @<:@-cc "CC"@:>@ @<:@-f@<:@lags@:>@ "CFLAGS"@:>@'
+ echo '       @<:@-ord@<:@inals@:>@@:>@ -ex@<:@clude@:>@ "symbol(s)"'
+ echo '       @<:@-libf@<:@lags@:>@ "{INIT|TERM}{GLOBAL|INSTANCE}"@:>@ @<:@-nocrt@<:@dll@:>@@:>@ @<:@-nolxl@<:@ite@:>@@:>@'
+ echo '       @<:@*.o@:>@ @<:@*.a@:>@'
+ echo '*> "output_file" should have no extension.'
+ echo '   If it has the .o, .a or .dll extension, it is automatically removed.'
+ echo '   The import library name is derived from this and is set to "name".a,'
+ echo '   unless overridden by -import'
+ echo '*> "importlib_name" should have no extension.'
+ echo '   If it has the .o, or .a extension, it is automatically removed.'
+ echo '   This name is used as the import library name and may be longer and'
+ echo '   more descriptive than the DLL name which has to follow the old '
+ echo '   8.3 convention of FAT.'
+ echo '*> "script.sh may be given to override the output_file name by a'
+ echo '   different name. It is mainly useful if the regular make process'
+ echo '   of some package does not take into account OS/2 restriction of'
+ echo '   DLL name lengths. It takes the importlib name as input and is'
+ echo '   supposed to procude a shorter name as output. The script should'
+ echo '   expect to get importlib_name without extension and should produce'
+ echo '   a (max.) 8 letter name without extension.'
+ echo '*> "cc" is used to use another GCC executable.   (default: gcc.exe)'
+ echo '*> "flags" should be any set of valid GCC flags. (default: -s -Zcrtdll)'
+ echo '   These flags will be put at the start of GCC command line.'
+ echo '*> -ord@<:@inals@:>@ tells dllar to export entries by ordinals. Be careful.'
+ echo '*> -ex@<:@clude@:>@ defines symbols which will not be exported. You can define'
+ echo '   multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*".'
+ echo '   If the last character of a symbol is "*", all symbols beginning'
+ echo '   with the prefix before "*" will be exclude, (see _GLOBAL* above).'
+ echo '*> -libf@<:@lags@:>@ can be used to add INITGLOBAL/INITINSTANCE and/or'
+ echo '   TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library.'
+ echo '*> -nocrt@<:@dll@:>@ switch will disable linking the library against emx''s'
+ echo '   C runtime DLLs.'
+ echo '*> -nolxl@<:@ite@:>@ switch will disable running lxlite on the resulting DLL.'
+ echo '*> All other switches (for example -L./ or -lmylib) will be passed'
+ echo '   unchanged to GCC at the end of command line.'
+ echo '*> If you create a DLL from a library and you do not specify -o,'
+ echo '   the basename for DLL and import library will be set to library name,'
+ echo '   the initial library will be renamed to 'name'_s.a (_s for static)'
+ echo '   i.e. "dllar gcc.a" will create gcc.dll and gcc.a, and the initial'
+ echo '   library will be renamed into gcc_s.a.'
+ echo '--------'
+ echo 'Example:'
+ echo '   dllar -o gcc290.dll libgcc.a -d "GNU C runtime library" -ord'
+ echo '    -ex "__main __ctordtor*" -libf "INITINSTANCE TERMINSTANCE"'
+ CleanUp
+ exit 1
+}
+
+# Execute a command.
+# If exit code of the commnad <> 0 CleanUp() is called and we'll exit the script.
+# @Uses    Whatever CleanUp() uses.
+doCommand() {
+    echo "${D}*"
+    eval ${D}*
+    rcCmd=${D}?
+
+    if @<:@ ${D}rcCmd -ne 0 @:>@; then
+        echo "command failed, exit code="${D}rcCmd
+        CleanUp
+        exit ${D}rcCmd
+    fi
+}
+
+# main routine
+# setup globals
+cmdLine=${D}*
+outFile=""
+outimpFile=""
+inputFiles=""
+renameScript=""
+description=""
+CC=gcc.exe
+CFLAGS="-s -Zcrtdll"
+EXTRA_CFLAGS=""
+EXPORT_BY_ORDINALS=0
+exclude_symbols=""
+library_flags=""
+curDir=\`pwd\`
+curDirS=curDir
+case ${D}curDirS in
+*/)
+  ;;
+*)
+  curDirS=${D}{curDirS}"/"
+  ;;
+esac
+# Parse commandline
+libsToLink=0
+omfLinking=0
+while @<:@ ${D}1 @:>@; do
+    case ${D}1 in
+    -ord*)
+        EXPORT_BY_ORDINALS=1;
+        ;;
+    -o*)
+	shift
+        outFile=${D}1
+	;;
+    -i*)
+        shift
+        outimpFile=${D}1
+        ;;
+    -name-mangler-script)
+        shift
+        renameScript=${D}1
+        ;;
+    -d*)
+        shift
+        description=${D}1
+        ;;
+    -f*)
+        shift
+        CFLAGS=${D}1
+        ;;
+    -c*)
+        shift
+        CC=${D}1
+        ;;
+    -h*)
+        PrintHelp
+        ;;
+    -ex*)
+        shift
+        exclude_symbols=${D}{exclude_symbols}${D}1" "
+        ;;
+    -libf*)
+        shift
+        library_flags=${D}{library_flags}${D}1" "
+        ;;
+    -nocrt*)
+        CFLAGS="-s"
+        ;;
+    -nolxl*)
+        flag_USE_LXLITE=0
+        ;;
+    -* | /*)
+        case ${D}1 in
+        -L* | -l*)
+            libsToLink=1
+            ;;
+        -Zomf)
+            omfLinking=1
+            ;;
+        *)
+            ;;
+        esac
+        EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
+        ;;
+    *.dll)
+        EXTRA_CFLAGS="${D}{EXTRA_CFLAGS} \`basnam ${D}1 .dll\`"
+        if @<:@ ${D}omfLinking -eq 1 @:>@; then
+            EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.lib"
+	else
+            EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.a"
+        fi
+        ;;
+    *)
+        found=0;
+        if @<:@ ${D}libsToLink -ne 0 @:>@; then
+            EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
+        else
+            for file in ${D}1 ; do
+                if @<:@ -f ${D}file @:>@; then
+                    inputFiles="${D}{inputFiles} ${D}file"
+                    found=1
+                fi
+            done
+            if @<:@ ${D}found -eq 0 @:>@; then
+                echo "ERROR: No file(s) found: "${D}1
+                exit 8
+            fi
+        fi
+      ;;
+    esac
+    shift
+done # iterate cmdline words
+
+#
+if @<:@ -z "${D}inputFiles" @:>@; then
+    echo "dllar: no input files"
+    PrintHelp
+fi
+
+# Now extract all .o files from .a files
+newInputFiles=""
+for file in ${D}inputFiles ; do
+    case ${D}file in
+    *.a | *.lib)
+        case ${D}file in
+        *.a)
+            suffix=".a"
+            AR="ar"
+            ;;
+        *.lib)
+            suffix=".lib"
+            AR="emxomfar"
+            EXTRA_CFLAGS="${D}EXTRA_CFLAGS -Zomf"
+            ;;
+        *)
+            ;;
+        esac
+        dirname=\`basnam ${D}file ${D}suffix\`"_%"
+        mkdir ${D}dirname
+        if @<:@ ${D}? -ne 0 @:>@; then
+            echo "Failed to create subdirectory ./${D}dirname"
+            CleanUp
+            exit 8;
+        fi
+        # Append '!' to indicate archive
+        newInputFiles="${D}newInputFiles ${D}{dirname}!"
+        doCommand "cd ${D}dirname; ${D}AR x ../${D}file"
+        cd ${D}curDir
+        found=0;
+        for subfile in ${D}dirname/*.o* ; do
+            if @<:@ -f ${D}subfile @:>@; then
+                found=1
+                if @<:@ -s ${D}subfile @:>@; then
+	            # FIXME: This should be: is file size > 32 byte, _not_ > 0!
+                    newInputFiles="${D}newInputFiles ${D}subfile"
+                fi
+            fi
+        done
+        if @<:@ ${D}found -eq 0 @:>@; then
+            echo "WARNING: there are no files in archive \\'${D}file\\'"
+        fi
+        ;;
+    *)
+        newInputFiles="${D}{newInputFiles} ${D}file"
+        ;;
+    esac
+done
+inputFiles="${D}newInputFiles"
+
+# Output filename(s).
+do_backup=0;
+if @<:@ -z ${D}outFile @:>@; then
+    do_backup=1;
+    set outFile ${D}inputFiles; outFile=${D}2
+fi
+
+# If it is an archive, remove the '!' and the '_%' suffixes
+case ${D}outFile in
+*_%!)
+    outFile=\`basnam ${D}outFile _%!\`
+    ;;
+*)
+    ;;
+esac
+case ${D}outFile in
+*.dll)
+    outFile=\`basnam ${D}outFile .dll\`
+    ;;
+*.DLL)
+    outFile=\`basnam ${D}outFile .DLL\`
+    ;;
+*.o)
+    outFile=\`basnam ${D}outFile .o\`
+    ;;
+*.obj)
+    outFile=\`basnam ${D}outFile .obj\`
+    ;;
+*.a)
+    outFile=\`basnam ${D}outFile .a\`
+    ;;
+*.lib)
+    outFile=\`basnam ${D}outFile .lib\`
+    ;;
+*)
+    ;;
+esac
+case ${D}outimpFile in
+*.a)
+    outimpFile=\`basnam ${D}outimpFile .a\`
+    ;;
+*.lib)
+    outimpFile=\`basnam ${D}outimpFile .lib\`
+    ;;
+*)
+    ;;
+esac
+if @<:@ -z ${D}outimpFile @:>@; then
+    outimpFile=${D}outFile
+fi
+defFile="${D}{outFile}.def"
+arcFile="${D}{outimpFile}.a"
+arcFile2="${D}{outimpFile}.lib"
+
+#create ${D}dllFile as something matching 8.3 restrictions,
+if @<:@ -z ${D}renameScript @:>@ ; then
+    dllFile="${D}outFile"
+else
+    dllFile=\`${D}renameScript ${D}outimpFile\`
+fi
+
+if @<:@ ${D}do_backup -ne 0 @:>@ ; then
+    if @<:@ -f ${D}arcFile @:>@ ; then
+        doCommand "mv ${D}arcFile ${D}{outFile}_s.a"
+    fi
+    if @<:@ -f ${D}arcFile2 @:>@ ; then
+        doCommand "mv ${D}arcFile2 ${D}{outFile}_s.lib"
+    fi
+fi
+
+# Extract public symbols from all the object files.
+tmpdefFile=${D}{defFile}_%
+rm -f ${D}tmpdefFile
+for file in ${D}inputFiles ; do
+    case ${D}file in
+    *!)
+        ;;
+    *)
+        doCommand "emxexp -u ${D}file >> ${D}tmpdefFile"
+        ;;
+    esac
+done
+
+# Create the def file.
+rm -f ${D}defFile
+echo "LIBRARY \`basnam ${D}dllFile\` ${D}library_flags" >> ${D}defFile
+dllFile="${D}{dllFile}.dll"
+if @<:@ ! -z ${D}description @:>@; then
+    echo "DESCRIPTION  \\"${D}{description}\\"" >> ${D}defFile
+fi
+echo "EXPORTS" >> ${D}defFile
+
+doCommand "cat ${D}tmpdefFile | sort.exe | uniq.exe > ${D}{tmpdefFile}%"
+grep -v "^ *;" < ${D}{tmpdefFile}% | grep -v "^ *${D}" >${D}tmpdefFile
+
+# Checks if the export is ok or not.
+for word in ${D}exclude_symbols; do
+    grep -v ${D}word < ${D}tmpdefFile >${D}{tmpdefFile}%
+    mv ${D}{tmpdefFile}% ${D}tmpdefFile
+done
+
+
+if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
+    sed "=" < ${D}tmpdefFile | \\
+    sed '
+      N
+      : loop
+      s/^\\(@<:@0-9@:>@\\+\\)\\(@<:@^;@:>@*\\)\\(;.*\\)\\?/\\2 @\\1 NONAME/
+      t loop
+    ' > ${D}{tmpdefFile}%
+    grep -v "^ *${D}" < ${D}{tmpdefFile}% > ${D}tmpdefFile
+else
+    rm -f ${D}{tmpdefFile}%
+fi
+cat ${D}tmpdefFile >> ${D}defFile
+rm -f ${D}tmpdefFile
+
+# Do linking, create implib, and apply lxlite.
+gccCmdl="";
+for file in ${D}inputFiles ; do
+    case ${D}file in
+    *!)
+        ;;
+    *)
+        gccCmdl="${D}gccCmdl ${D}file"
+        ;;
+    esac
+done
+doCommand "${D}CC ${D}CFLAGS -Zdll -o ${D}dllFile ${D}defFile ${D}gccCmdl ${D}EXTRA_CFLAGS"
+touch "${D}{outFile}.dll"
+
+doCommand "emximp -o ${D}arcFile ${D}defFile"
+if @<:@ ${D}flag_USE_LXLITE -ne 0 @:>@; then
+    add_flags="";
+    if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
+        add_flags="-ynd"
+    fi
+    doCommand "lxlite -cs -t: -mrn -mln ${D}add_flags ${D}dllFile"
+fi
+doCommand "emxomf -s -l ${D}arcFile"
+
+# Successful exit.
+CleanUp 1
+exit 0
+EOF
+dnl ===================== dllar.sh ends here =====================
+])
+
 AC_DEFUN([AC_BAKEFILE_CREATE_FILE_BK_DEPS],
 [
 dnl ===================== bk-deps begins here =====================
@@ -981,7 +1439,7 @@ while test ${D}# -gt 0; do
         args="${D}{args} ${D}1 ${D}2"
         shift
         ;;
-
+       
        -s|-Wl,*)
         # collect these load args
         ldargs="${D}{ldargs} ${D}1"

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/Makefile

@@ -1,26 +0,0 @@
-# Created: 2005/03/12
-# Author: David Elliott
-
-# For autoconf: Debian in their infinite wisdom decided to improve upon
-# the standard autoconf 2.59 macros. Thus Debian's autoconf generates
-# a totally different configure script.  This fixes it to look
-# mostly like Debian's.  There are also some fixes pulled in from the OS/2
-# fork of autoconf.
-
-# Rule to freeze the m4 so autoconf will actually use it.
-# NOTE: VERY important to cd to somewhere there are no .m4 files.
-# or at least no aclocal.m4 or else autom4te helpfully picks it up.
-.PHONY: all
-all: autoconf/autoconf.m4f
-
-AUTOCONF_SOURCES = \
-  autoconf/c.m4 \
-  autoconf/general.m4 \
-  autoconf/libs.m4 \
-  autoconf/status.m4
-
-AUTOM4TE=autom4te
-
-autoconf/autoconf.m4f: $(AUTOCONF_SOURCES)
-	$(AUTOM4TE) -B . --language=Autoconf --freeze --output=autoconf/autoconf.m4f
-

build/autoconf_prepend-include/README.txt

@@ -1,22 +0,0 @@
-wxAutohacks
-
-wxAutohacks is a way of ensuring the configure script remains consistent
-between developer commits.  Previous releases include a build/aclocal_include
-which has now been moved into the wxWidgets build/aclocal directory.
-
-At the moment, it is intended to be copied and or symlinked into a wxWidgets
-source tree.  For example, assume you have wxWidgets checked out in the
-/home/myname/wxCVS/wxWidgets/ path.  Then from /home/myname/wxCVS do this:
-cvs -d :pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout wxAutohacks
-
-You will now have wxAutohacks in /home/myname/wxCVS/wxAutohacks/.  Now go into
-the wxWidgets build (/home/myname/wxCVS/wxWidgets/build/) and do this:
-ln -s ../../wxAutohacks/build/autoconf_prepend-include .
-
-From now on from the root of your wxWidgets source tree when you do this:
-make -f build/autogen.mk
-you will also build an autoconf.m4f file which will ensure the configure
-script stays consistent.
-
-Alternatively you can do this:
-make -f build/autogen.mk AUTOHACKS_PREPEND_INCLUDE_DIR=../wxAutohacks/build/autoconf_prepend-include

build/autoconf_prepend-include/autoconf/libs.m4

@@ -1,496 +0,0 @@
-# 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.
-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# 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
-# 02110-1301, USA.
-
-# As a special exception, the Free Software Foundation gives unlimited
-# permission to copy, distribute and modify the configure scripts that
-# are the output of Autoconf.  You need not follow the terms of the GNU
-# General Public License when using or distributing such scripts, even
-# though portions of the text of Autoconf appear in them.  The GNU
-# General Public License (GPL) does govern all other use of the material
-# that constitutes the Autoconf program.
-#
-# Certain portions of the Autoconf source text are designed to be copied
-# (in certain cases, depending on the input) into the output of
-# Autoconf.  We call these the "data" portions.  The rest of the Autoconf
-# source text consists of comments plus executable code that decides which
-# of the data portions to output in any given case.  We call these
-# comments and executable code the "non-data" portions.  Autoconf never
-# copies any of the non-data portions into its output.
-#
-# This special exception to the GPL applies to versions of Autoconf
-# released by the Free Software Foundation.  When you make and
-# distribute a modified version of Autoconf, you may extend this special
-# exception to the GPL to apply to your modified version as well, *unless*
-# your modified version has the potential to copy into its output some
-# of the text that was the non-data portion of the version that you started
-# with.  (In other words, unless your change moves or copies text from
-# the non-data portions to the data portions.)  If your modification has
-# such potential, you must delete any notice of this special exception
-# to the GPL from your modified version.
-#
-# Written by David MacKenzie, with help from
-# Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor,
-# Roland McGrath, Noah Friedman, david d zuhn, and many others.
-
-# Table of contents
-#
-# 1. Generic tests for libraries
-# 2. Tests for specific libraries
-
-
-## --------------------------------- ##
-## 1. Generic tests for libraries.## ##
-## --------------------------------- ##
-
-
-
-# AC_SEARCH_LIBS(FUNCTION, SEARCH-LIBS,
-#                [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
-#                [OTHER-LIBRARIES])
-# --------------------------------------------------------
-# 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_Search],
-[ac_func_search_save_LIBS=$LIBS
-AC_LANG_CONFTEST([AC_LANG_CALL([], [$1])])
-for ac_lib in '' $2; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
-  fi
-  AC_LINK_IFELSE([], [AS_VAR_SET([ac_Search], [$ac_res])])
-  AS_VAR_SET_IF([ac_Search], [break])dnl
-done
-AS_VAR_SET_IF([ac_Search], , [AS_VAR_SET([ac_Search], [no])])dnl
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS])
-ac_res=AS_VAR_GET([ac_Search])
-AS_IF([test "$ac_res" != no],
-  [test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  $3],
-      [$4])dnl
-AS_VAR_POPDEF([ac_Search])dnl
-])
-
-
-
-# AC_CHECK_LIB(LIBRARY, FUNCTION,
-#              [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
-#              [OTHER-LIBRARIES])
-# ------------------------------------------------------
-#
-# Use a cache variable name containing both the library and function name,
-# because the test really is for library $1 defining function $2, not
-# just for library $1.  Separate tests with the same $1 and different $2s
-# may have different results.
-#
-# Note that using directly AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])
-# is asking for troubles, since AC_CHECK_LIB($lib, fun) would give
-# ac_cv_lib_$lib_fun, which is definitely not what was meant.  Hence
-# the AS_LITERAL_IF indirection.
-#
-# FIXME: This macro is extremely suspicious.  It DEFINEs unconditionally,
-# whatever the FUNCTION, in addition to not being a *S macro.  Note
-# that the cache does depend upon the function we are looking for.
-#
-# It is on purpose we used `ac_check_lib_save_LIBS' and not just
-# `ac_save_LIBS': there are many macros which don't want to see `LIBS'
-# changed but still want to use AC_CHECK_LIB, so they save `LIBS'.
-# And ``ac_save_LIBS' is too tempting a name, so let's leave them some
-# freedom.
-AC_DEFUN([AC_CHECK_LIB],
-[m4_ifval([$3], , [AH_CHECK_LIB([$1])])dnl
-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_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], [no])])
-LIBS=$ac_check_lib_save_LIBS])
-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"
-])],
-      [$4])dnl
-AS_VAR_POPDEF([ac_Lib])dnl
-])# AC_CHECK_LIB
-
-
-# AH_CHECK_LIB(LIBNAME)
-# ---------------------
-m4_define([AH_CHECK_LIB],
-[AH_TEMPLATE(AS_TR_CPP([HAVE_LIB$1]),
-	     [Define to 1 if you have the `$1' library (-l$1).])])
-
-
-# AC_HAVE_LIBRARY(LIBRARY,
-#                 [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
-#                 [OTHER-LIBRARIES])
-# ---------------------------------------------------------
-#
-# This macro is equivalent to calling `AC_CHECK_LIB' with a FUNCTION
-# argument of `main'.  In addition, LIBRARY can be written as any of
-# `foo', `-lfoo', or `libfoo.a'.  In all of those cases, the compiler
-# is passed `-lfoo'.  However, LIBRARY cannot be a shell variable;
-# it must be a literal name.
-AU_DEFUN([AC_HAVE_LIBRARY],
-[m4_pushdef([AC_Lib_Name],
-	    m4_bpatsubst(m4_bpatsubst([[$1]],
-				    [lib\([^\.]*\)\.a], [\1]),
-			[-l], []))dnl
-AC_CHECK_LIB(AC_Lib_Name, main, [$2], [$3], [$4])dnl
-ac_cv_lib_[]AC_Lib_Name()=ac_cv_lib_[]AC_Lib_Name()_main
-m4_popdef([AC_Lib_Name])dnl
-])
-
-
-
-
-## --------------------------------- ##
-## 2. Tests for specific libraries.  ##
-## --------------------------------- ##
-
-
-
-# --------------------- #
-# Checks for X window.  #
-# --------------------- #
-
-
-# _AC_PATH_X_XMKMF
-# ----------------
-# 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 -f -r conftest.dir
-if mkdir conftest.dir; then
-  cd conftest.dir
-  cat >Imakefile <<'_ACEOF'
-incroot:
-	@echo incroot='${INCROOT}'
-usrlibdir:
-	@echo usrlibdir='${USRLIBDIR}'
-libdir:
-	@echo libdir='${LIBDIR}'
-_ACEOF
-  if (export CC; ${XMKMF-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 "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" &&
-	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
-	ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # 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= ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-    esac
-    case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-    esac
-  fi
-  cd ..
-  rm -f -r conftest.dir
-fi
-])# _AC_PATH_X_XMKMF
-
-
-# _AC_PATH_X_DIRECT
-# -----------------
-# Internal subroutine of _AC_PATH_X.
-# Set ac_x_includes and/or ac_x_libraries.
-m4_define([_AC_PATH_X_DIRECT],
-[# Standard set of common directories for X headers.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
-/usr/X11/include
-/usr/X11R6/include
-/usr/X11R5/include
-/usr/X11R4/include
-
-/usr/include/X11
-/usr/include/X11R6
-/usr/include/X11R5
-/usr/include/X11R4
-
-/usr/local/X11/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
-
-/usr/local/include/X11
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
-
-/usr/X386/include
-/usr/x386/include
-/usr/XFree86/include/X11
-
-/usr/include
-/usr/local/include
-/usr/unsupported/include
-/usr/athena/include
-/usr/local/x11r5/include
-/usr/lpp/Xamples/include
-
-/usr/openwin/include
-/usr/openwin/share/include'
-
-if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Xlib.h.
-  # 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.
-ac_x_includes=],
-[for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Xlib.h"; then
-    ac_x_includes=$ac_dir
-    break
-  fi
-done])
-fi # $ac_x_includes = no
-
-if test "$ac_x_libraries" = no; then
-  # Check for the libraries.
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS=$LIBS
-  LIBS="-lX11 $LIBS"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
-				  [XrmInitialize ()])],
-		 [LIBS=$ac_save_LIBS
-# We can link X programs with no special library path.
-ac_x_libraries=],
-		 [LIBS=$ac_save_LIBS
-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
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done])
-fi # $ac_x_libraries = no
-])# _AC_PATH_X_DIRECT
-
-
-# _AC_PATH_X
-# ----------
-# Compute ac_cv_have_x.
-AC_DEFUN([_AC_PATH_X],
-[AC_CACHE_VAL(ac_cv_have_x,
-[# One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
-_AC_PATH_X_XMKMF
-_AC_PATH_X_DIRECT
-case $ac_x_includes,$ac_x_libraries in #(
-  no,* | *,no | *\'*)
-    # Didn't find X, or a directory has "'" in its name.
-    ac_cv_have_x="have_x=no";; #(
-  *)
-    # Record where we found X for the cache.
-    ac_cv_have_x="have_x=yes\
-	ac_x_includes='$ac_x_includes'\
-	ac_x_libraries='$ac_x_libraries'"
-esac])dnl
-])
-
-
-# AC_PATH_X
-# ---------
-# If we find X, set shell vars x_includes and x_libraries to the
-# paths, otherwise set no_x=yes.
-# Uses ac_ vars as temps to allow command line to override cache and checks.
-# --without-x overrides everything else, but does not touch the cache.
-AN_HEADER([X11/Xlib.h],  [AC_PATH_X])
-AC_DEFUN([AC_PATH_X],
-[dnl Document the X abnormal options inherited from history.
-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])
-
-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 #(
-    *\'*) AC_MSG_ERROR([Cannot use X directory names containing ']);; #(
-    *,NONE | NONE,*) _AC_PATH_X;; #(
-    *) have_x=yes;;
-  esac
-  eval "$ac_cv_have_x"
-fi # $with_x != no
-
-if test "$have_x" != yes; then
-  AC_MSG_RESULT([$have_x])
-  no_x=yes
-else
-  # If each of the values was on the command line, it overrides each guess.
-  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_x_includes='$x_includes'\
-	ac_x_libraries='$x_libraries'"
-  AC_MSG_RESULT([libraries $x_libraries, headers $x_includes])
-fi
-])# AC_PATH_X
-
-
-
-# AC_PATH_XTRA
-# ------------
-# Find additional X libraries, magic flags, etc.
-AC_DEFUN([AC_PATH_XTRA],
-[AC_REQUIRE([AC_PATH_X])dnl
-if test "$no_x" = yes; then
-  # Not all programs may use this symbol, but it does not hurt to define it.
-  AC_DEFINE([X_DISPLAY_MISSING], 1,
-	    [Define to 1 if the X Window System is missing or not being used.])
-  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
-  if test -n "$x_includes"; then
-    X_CFLAGS="$X_CFLAGS -I$x_includes"
-  fi
-
-  # 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"
-    # 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])
-    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-    ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag=$ac_[]_AC_LANG_ABBREV[]_werror_flag
-    ac_[]_AC_LANG_ABBREV[]_werror_flag=yes
-    AC_LINK_IFELSE([AC_LANG_PROGRAM()],
-      [AC_MSG_RESULT([no])
-       X_LIBS="$X_LIBS -R$x_libraries"],
-      [LIBS="$ac_xsave_LIBS -R $x_libraries"
-       AC_LINK_IFELSE([AC_LANG_PROGRAM()],
-	 [AC_MSG_RESULT([yes])
-	  X_LIBS="$X_LIBS -R $x_libraries"],
-	 [AC_MSG_RESULT([neither works])])])
-    ac_[]_AC_LANG_ABBREV[]_werror_flag=$ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag
-    LIBS=$ac_xsave_LIBS
-  fi
-
-  # Check for system-dependent libraries X programs must link with.
-  # Do this before checking for the system-independent R6 libraries
-  # (-lICE), since we may need -lsocket or whatever for X linking.
-
-  if test "$ISC" = yes; then
-    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-  else
-    # Martyn Johnson says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And Karl Berry says
-    # the Alpha needs dnet_stub (dnet does not exist).
-    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-    AC_LINK_IFELSE([AC_LANG_CALL([], [XOpenDisplay])],
-		   [],
-    [AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
-    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      AC_CHECK_LIB(dnet_stub, dnet_ntoa,
-	[X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
-    fi])
-    LIBS="$ac_xsave_LIBS"
-
-    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-    # to get the SysV transport functions.
-    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
-    # needs -lnsl.
-    # The nsl library prevents programs from opening the X display
-    # on Irix 5.2, according to T.E. Dickey.
-    # The functions gethostbyname, getservbyname, and inet_addr are
-    # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    AC_CHECK_FUNC(gethostbyname)
-    if test $ac_cv_func_gethostbyname = no; then
-      AC_CHECK_LIB(nsl, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
-      if test $ac_cv_lib_nsl_gethostbyname = no; then
-	AC_CHECK_LIB(bsd, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd")
-      fi
-    fi
-
-    # lieder@skyler.mavd.honeywell.com says without -lsocket,
-    # socket/setsockopt and other routines are undefined under SCO ODT
-    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-    # on later versions), says Simon Leinen: it contains gethostby*
-    # variants that don't use the name server (or something).  -lsocket
-    # must be given before -lnsl if both are needed.  We assume that
-    # if connect needs -lnsl, so does gethostbyname.
-    AC_CHECK_FUNC(connect)
-    if test $ac_cv_func_connect = no; then
-      AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
-	$X_EXTRA_LIBS)
-    fi
-
-    # Guillermo Gomez says -lposix is necessary on A/UX.
-    AC_CHECK_FUNC(remove)
-    if test $ac_cv_func_remove = no; then
-      AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
-    fi
-
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    AC_CHECK_FUNC(shmat)
-    if test $ac_cv_func_shmat = no; then
-      AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc")
-    fi
-  fi
-
-  # Check for libraries that X11R6 Xt/Xaw programs need.
-  ac_save_LDFLAGS=$LDFLAGS
-  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-  # check for ICE first), but we must link in the order -lSM -lICE or
-  # we get undefined symbols.  So assume we have SM if we have ICE.
-  # These have to be linked with before -lX11, unlike the other
-  # libraries we check for below, so use a different variable.
-  # John Interrante, Karl Berry
-  AC_CHECK_LIB(ICE, IceConnectionNumber,
-    [X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], , $X_EXTRA_LIBS)
-  LDFLAGS=$ac_save_LDFLAGS
-
-fi
-AC_SUBST(X_CFLAGS)dnl
-AC_SUBST(X_PRE_LIBS)dnl
-AC_SUBST(X_LIBS)dnl
-AC_SUBST(X_EXTRA_LIBS)dnl
-])# AC_PATH_XTRA

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/visibility.m4
+  build/aclocal/sdl.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

@@ -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,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../demos/*.bkl">
-        msvc6prj,msevc4prj,msvs2005prj
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">
-        msvc6prj,msevc4prj,msvs2005prj
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../samples/mobile/mobile_samples.bkl">
-        msvc6prj,msevc4prj,msvs2005prj
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">
-        msvc6prj,msevc4prj,msvs2005prj
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../utils/*.bkl">
-        msvc6prj,msevc4prj,msvs2005prj
+        msvc6prj,msevc4prj,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,watcom,cbuilderx,cbx_unix
     </del-formats>
 
 
@@ -108,17 +114,24 @@
     <add-flags files="wx.bkl" formats="msvc6prj">
         -o../msw/wx.dsw
     </add-flags>
-    <add-flags files="wx.bkl" formats="msvs2005prj">
-        -o../msw/wx.sln
-    </add-flags>
     <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">
+               formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj">
         -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
     </add-flags>
 
@@ -129,6 +142,11 @@
         -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4
     </add-flags>
 
+    <add-formats files="wx.bkl">wx24dsp</add-formats>
+    <add-flags formats="wx24dsp">
+        -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
+    </add-flags>
+
     <add-formats files="wx.bkl">rpmspec</add-formats>
 
 
@@ -137,8 +155,7 @@
     <add-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom">
         -DWRITE_OPTIONS_FILE=0
     </add-flags>
-    <del-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom"
-               files="wx.bkl">
+    <del-flags files="wx.bkl">
         -DWRITE_OPTIONS_FILE=0
     </del-flags>
 

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','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.1.7"/>
 
     <!-- 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>
 
@@ -350,22 +347,28 @@
 
     <!-- deal with the need to copy setup.h here: -->
 
-    <set var="IS_MSVC_PRJ">
-        $(FORMAT in ['msvc6prj','msevc4prj','msvs2005prj'])
-    </set>
+    <set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>
 
     <define-tag name="msvc-headers" rules="dll,lib">
         <if cond="IS_MSVC_PRJ">
-            <msvc-project-files>
-                $(addPrefixToList('include\\', wxwin.headersOnly(value)))
-            </msvc-project-files>
+            <!-- FIXME: remove this once we require >=bkl-0.1.9 -->
+            <if cond="BAKEFILE_VERSION in ['0.1.7', '0.1.8']">
+                <msvc-project-files>
+                    $(addPrefixToList('include\', wxwin.headersOnly(value)))
+                </msvc-project-files>
+            </if>
+            <if cond="BAKEFILE_VERSION not in ['0.1.7', '0.1.8']">
+                <msvc-project-files>
+                    $(addPrefixToList('include\\', wxwin.headersOnly(value)))
+                </msvc-project-files>
+            </if>
         </if>
     </define-tag>
 
     <set var="msvc_copy_setup_h_script">
         <if cond="IS_MSVC_PRJ">
 Creating $(SETUPHDIR)\wx\setup.h
-InputPath=..\..\include\wx\%s
+InputPath=..\include\wx\%s
 
 "$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
@@ -424,9 +427,8 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             </set>
             <set var="_custom_build_include_wx_msw_genrcdefs_h">
 Creating $(SETUPHDIR)\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(DOLLAR)(SETUPHDIR)\wx\msw"
 $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
             </set>
         </if>
@@ -449,7 +451,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"/>
 
 
     <!-- =============================================================== -->
@@ -494,9 +495,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
             <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) -->
@@ -598,8 +597,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>
 
-        <define>WXBUILDING</define>
-
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
             <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']">
                 <sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
@@ -649,10 +646,12 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
 
         <!-- version info resources: -->
-        <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
-        <if cond="FORMAT=='autoconf'">
-            <res-include>$(RCDEFDIR)</res-include>
-            <res-include>$(TOP_SRCDIR)include</res-include>
+        <if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
+            <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
+            <if cond="FORMAT=='autoconf'">
+                <res-include>$(RCDEFDIR)</res-include>
+                <res-include>$(TOP_SRCDIR)include</res-include>
+            </if>
         </if>
         <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
     </template>
@@ -661,7 +660,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 +674,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>
@@ -98,8 +98,8 @@ Accepted values: AMD64, IA64.
     <!-- FIXME: restore this once bakefile is fixed to not use
                 /Gm /GZ (incompatible with /O2) w/ debug-info -->
     <set var="DEBUG_INFO_DEFAULT">
-        <if cond="FORMAT in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">1</if>
-        <if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">default</if>
+        <if cond="FORMAT in ['msvc','msvc6prj','msevc4prj']">1</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj']">default</if>
     </set>
     -->
     <set var="DEBUG_INFO_DEFAULT">default</set>
@@ -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>
@@ -239,8 +231,8 @@ Acts according to BUILD by default.
 
     <!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
     <set var="USE_QA_DEFAULT">
-        <if cond="FORMAT in ['msvc','msvc6prj','msvs2005prj']">1</if>
-        <if cond="FORMAT not in ['msvc','msvc6prj','msvs2005prj']">0</if>
+        <if cond="FORMAT in ['msvc','msvc6prj']">1</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj']">0</if>
     </set>
     <option name="USE_QA">
         <values>0,1</values>
@@ -352,7 +344,6 @@ to run the tests, include CppUnit library here.
         <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"/>
@@ -434,6 +425,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 +441,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>
@@ -463,6 +459,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 +479,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,12 @@ 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/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 +197,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>
 
@@ -319,8 +293,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 +304,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 +340,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/wxprintf.cpp
+    src/common/wxchar.cpp
     src/common/xti.cpp
     src/common/xtistrm.cpp
     src/common/zipstrm.cpp
@@ -404,12 +368,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 +379,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 +393,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 +450,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 +460,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 +469,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 +561,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 +568,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 +583,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 +591,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
@@ -691,13 +638,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/rgncmn.cpp
     src/common/settcmn.cpp
     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,7 +660,6 @@ 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/listbkg.cpp
@@ -729,7 +673,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/selstore.cpp
     src/generic/spinctlg.cpp
     src/generic/splitter.cpp
-    src/generic/srchctlg.cpp
     src/generic/textdlgg.cpp
     src/generic/tipwin.cpp
     src/generic/toolbkg.cpp
@@ -742,7 +685,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 +702,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 +721,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
@@ -796,8 +736,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/scrolwin.h
     wx/generic/spinctlg.h
     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 +752,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 +768,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 +803,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 +813,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 +837,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
@@ -917,7 +854,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/spinbutt.h
     wx/spinctrl.h
     wx/splitter.h
-    wx/srchctrl.h
     wx/statline.h
     wx/tab.h
     wx/tabctrl.h
@@ -970,12 +906,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/icon.cpp
     src/generic/paletteg.cpp
     src/gtk/app.cpp
-    src/gtk/assertdlg_gtk.c
     src/gtk/bitmap.cpp
     src/gtk/brush.cpp
     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 +919,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
@@ -1004,7 +940,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/icon.h
     wx/generic/paletteg.h
     wx/gtk/app.h
-    wx/gtk/assertdlg_gtk.h
     wx/gtk/bitmap.h
     wx/gtk/brush.h
     wx/gtk/clipbrd.h
@@ -1023,6 +958,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
@@ -1065,7 +1001,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 +1019,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 +1035,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 +1043,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 +1051,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 +1070,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 +1137,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 +1188,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 +1321,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 +1343,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 +1379,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 +1393,6 @@ 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/generic/icon.cpp
     src/generic/timer.cpp
     src/x11/app.cpp
@@ -1478,6 +1409,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/x11/dcscreen.cpp
     src/x11/evtloop.cpp
     src/x11/font.cpp
+    src/x11/gsockx11.cpp
     src/x11/minifram.cpp
     src/x11/nanox.c
     src/x11/palette.cpp
@@ -1549,12 +1481,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 +1504,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 +1574,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 +1596,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 +1655,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
@@ -1816,7 +1747,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="MGL_LOWLEVEL_SRC" hints="files">
-    src/common/fontmgrcmn.cpp
     src/generic/caret.cpp
     src/generic/colour.cpp
     src/generic/icon.cpp
@@ -1837,7 +1767,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mgl/evtloop.cpp
     src/mgl/font.cpp
     src/mgl/fontenum.cpp
-    src/mgl/fontmgr.cpp
     src/mgl/fontutil.cpp
     src/mgl/palette.cpp
     src/mgl/pen.cpp
@@ -1853,6 +1782,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
@@ -1864,6 +1794,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mgl/dcmemory.h
     wx/mgl/dcscreen.h
     wx/mgl/font.h
+    wx/mgl/fontutil.h
     wx/mgl/palette.h
     wx/mgl/pen.h
     wx/mgl/popupwin.h
@@ -1879,8 +1810,6 @@ 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/generic/caret.cpp
     src/generic/colour.cpp
     src/generic/icon.cpp
@@ -1899,8 +1828,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/dfb/evtloop.cpp
     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 +1843,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 +1856,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 +2026,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
@@ -2143,7 +2070,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
@@ -2204,7 +2130,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/slider.cpp
     src/mac/carbon/spinbutt.cpp
     src/mac/carbon/spinctrl.cpp
-    src/mac/carbon/srchctrl.cpp
     src/mac/carbon/statbmp.cpp
     src/mac/carbon/statbox.cpp
     src/mac/carbon/statbrma.cpp
@@ -2264,6 +2189,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
@@ -2296,7 +2222,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/sound.h
     wx/mac/spinbutt.h
     wx/mac/spinctrl.h
-    wx/mac/srchctrl.h
     wx/mac/statbmp.h
     wx/mac/statbox.h
     wx/mac/statline.h
@@ -2305,6 +2230,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
@@ -2372,9 +2298,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/printdlg.h
     wx/mac/carbon/printmac.h
     wx/mac/carbon/private.h
-    wx/mac/carbon/private/mactext.h
-    wx/mac/carbon/private/overlay.h
-    wx/mac/carbon/private/print.h
     wx/mac/carbon/radiobox.h
     wx/mac/carbon/radiobut.h
     wx/mac/carbon/region.h
@@ -2382,7 +2305,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/slider.h
     wx/mac/carbon/spinbutt.h
     wx/mac/carbon/spinctrl.h
-    wx/mac/carbon/srchctrl.h
     wx/mac/carbon/statbmp.h
     wx/mac/carbon/statbox.h
     wx/mac/carbon/statline.h
@@ -2390,6 +2312,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
@@ -2428,7 +2351,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/NSMenu.mm
     src/cocoa/NSPanel.mm
     src/cocoa/NSScroller.mm
-    src/cocoa/NSSlider.mm
     src/cocoa/NSTabView.mm
     src/cocoa/NSTableView.mm
     src/cocoa/NSTextField.mm
@@ -2461,7 +2383,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/drawer.mm
     src/cocoa/evtloop.mm
     src/cocoa/filedlg.mm
-    src/cocoa/font.mm
+    src/cocoa/font.cpp
     src/cocoa/fontdlg.mm
     src/cocoa/fontenum.mm
     src/cocoa/fontutil.cpp
@@ -2494,7 +2416,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/toolbar.mm
     src/cocoa/tooltip.mm
     src/cocoa/toplevel.mm
-    src/cocoa/utils.mm
+    src/cocoa/utils.cpp
     src/cocoa/utilsexc.mm
     src/cocoa/window.mm
     <!-- Generic implementations used by wxCocoa: -->
@@ -2519,7 +2441,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/NSMenu.h
     wx/cocoa/NSPanel.h
     wx/cocoa/NSScroller.h
-    wx/cocoa/NSSlider.h
     wx/cocoa/NSTabView.h
     wx/cocoa/NSTableView.h
     wx/cocoa/NSTextField.h
@@ -2579,12 +2500,10 @@ 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
     wx/cocoa/window.h
-    <!-- Semi-private headers -->
-    wx/cocoa/objc/objc_uniquifying.h
     <!-- Generic implementations used by wxCocoa: -->
     wx/generic/caret.h
     wx/generic/fdrepdlg.h
@@ -2662,7 +2581,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
@@ -2706,7 +2624,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/univ/stdrend.h
     wx/univ/textctrl.h
     wx/univ/theme.h
-    wx/univ/tglbtn.h
     wx/univ/toolbar.h
     wx/univ/toplevel.h
     wx/univ/window.h
@@ -2719,19 +2636,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,7 +2657,6 @@ 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
@@ -2750,7 +2664,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dataview.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 +2675,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,6 +2691,7 @@ 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>
 
@@ -2817,16 +2731,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 +2777,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">
@@ -3045,7 +2953,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/xrc/xh_notbk.cpp
     src/xrc/xh_odcombo.cpp
     src/xrc/xh_panel.cpp
-    src/xrc/xh_propdlg.cpp
     src/xrc/xh_radbt.cpp
     src/xrc/xh_radbx.cpp
     <!-- disabled until linking problems are fixed -->
@@ -3057,7 +2964,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
@@ -3107,7 +3013,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xrc/xh_notbk.h
     wx/xrc/xh_odcombo.h
     wx/xrc/xh_panel.h
-    wx/xrc/xh_propdlg.h
     wx/xrc/xh_radbt.h
     wx/xrc/xh_radbx.h
     <!-- wx/xrc/xh_richtext.h -->
@@ -3118,7 +3023,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 +3059,30 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                             OpenGL canvas                              -->
 <!-- ====================================================================== -->
 
-<set var="OPENGL_SRC_PLATFORM" hints="files">
-    src/common/glcmn.cpp
+<set var="OPENGL_SRC" hints="files">
     <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'">
-        src/gtk/glcanvas.cpp
-        src/unix/glx11.cpp
-    </if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">
-        src/gtk1/glcanvas.cpp
-        src/unix/glx11.cpp
-    </if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">src/gtk/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">src/gtk1/glcanvas.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=='X11'">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</if>
     <if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
 </set>
 
-<set var="OPENGL_SRC" hints="files">
-    src/common/glcmn.cpp
-    $(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>
+<set var="OPENGL_HDR" hints="files">
+    <if cond="TOOLKIT=='MAC'">wx/mac/carbon/glcanvas.h</if>
     <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
-        wx/gtk/glcanvas.h
-        wx/unix/glx11.h
-    </if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">
-        wx/gtk1/glcanvas.h
-        wx/unix/glx11.h
-    </if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">wx/gtk/glcanvas.h</if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">wx/gtk1/glcanvas.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=='X11'">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</if>
+    <if cond="TOOLKIT=='PM'">wx/os2/glcanvas.h</if>
 </set>
 
-<set var="OPENGL_HDR" hints="files">
-    wx/glcanvas.h
-    $(OPENGL_HDR_PLATFORM)
-</set>
 
 
 <!-- ====================================================================== -->
@@ -3270,7 +3153,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="RICHTEXT_HDR" hints="files">
     wx/richtext/richtextctrl.h
     wx/richtext/richtextbuffer.h
-    wx/richtext/richtexthtml.h
     wx/richtext/richtextstyles.h
     wx/richtext/richtextxml.h
     wx/richtext/richtextformatdlg.h
@@ -3279,21 +3161,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:              -->
 <!-- ====================================================================== -->
@@ -3458,7 +3325,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">
@@ -3470,7 +3336,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
-        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
     </set>
 
@@ -3530,7 +3395,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>
+
+    <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/wx24dsp.bkl

@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+
+<makefile>
+
+    <include file="win32.bkl"/>
+    <set var="COMPILER">vc</set>
+    <include file="presets/fake.bkl"/>
+
+    <set var="ALL_SOURCES" eval="0">
+        $(MONOLIB_SRC) src/common/dummy.cpp $(OPENGL_SRC)
+    </set>
+    
+    <output file="$(OUTPUT_FILE)" writer="wx24dsp.empy"/>
+    <set var="FORMAT_OUTPUT_VARIABLES">
+        ALL_SOURCES ALL_HEADERS
+    </set>
+    
+</makefile>

build/bakefiles/formats/wx24dsp.empy

@@ -0,0 +1,461 @@
+@{
+
+used = {}
+def mkgroup(lst, name, mask):
+    x = [s for s in lst if s.startswith(mask)]
+    for s in x:
+        used[s] = 1
+    x.sort()
+    return (name,x)
+    
+sources = ALL_SOURCES.split()
+SOURCES = []
+SOURCES.append(mkgroup(sources,'Common Files','src/common/'))
+SOURCES.append(mkgroup(sources,'Generic Files','src/generic/'))
+SOURCES.append(mkgroup(sources,'wxHTML Files','src/html/'))
+SOURCES.append(mkgroup(sources,'MSW Files','src/msw/'))
+otherSrcs = [x for x in sources if x not in used]
+otherSrcs.sort()
+SOURCES.append(('Other Sources', otherSrcs))
+
+headers = [x for x in ALL_HEADERS.split() if x.endswith('.h')]
+HEADERS = []
+HEADERS.append(mkgroup(headers,'MSW','wx/msw/'))
+HEADERS.append(mkgroup(headers,'Generic','wx/generic/'))
+HEADERS.append(mkgroup(headers,'HTML','wx/html/'))
+commonHdrs = [x for x in headers if x not in used]
+commonHdrs.sort()
+HEADERS.insert(0, ('Common', commonHdrs))
+
+}@
+# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=wxWindows - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "wxWindows.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "wxWindows.mak" CFG="wxWindows - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "wxWindows - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../ReleaseUnicodeDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../ReleaseUnicodeDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../DebugUnicodeDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../DebugUnicodeDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../ReleaseUnicode"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../ReleaseUnicode"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmswu.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../DebugUnicode"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../DebugUnicode"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmswud.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../ReleaseDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../ReleaseDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../DebugDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../DebugDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../Debug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmswd.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "wxWindows___Win32_Release_With_Debug_Info"
+# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_With_Debug_Info"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseDebug"
+# PROP Intermediate_Dir "ReleaseDebug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\lib\wxmsw.lib"
+# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "wxWindows - Win32 Release Unicode DLL"
+# Name "wxWindows - Win32 Debug Unicode DLL"
+# Name "wxWindows - Win32 Release Unicode"
+# Name "wxWindows - Win32 Debug Unicode"
+# Name "wxWindows - Win32 Release DLL"
+# Name "wxWindows - Win32 Debug DLL"
+# Name "wxWindows - Win32 Release"
+# Name "wxWindows - Win32 Debug"
+# Name "wxWindows - Win32 Release With Debug Info"
+# Begin Source File
+
+SOURCE="This project is deprecated, please see install.txt"
+# End Source File
+@[for group in SOURCES]@
+# Begin Group "@group[0]"
+
+# PROP Default_Filter ""
+@[for src in group[1]]@
+# Begin Source File
+
+SOURCE=.\@src[4:].replace('/','\\')
+@[if src=='src/common/dummy.cpp']@
+# ADD CPP /Yc"wx/wxprec.h"
+@[end if]@
+@[if src.endswith('.c')]@
+# SUBTRACT CPP /YX /Yc /Yu
+@[end if]@
+# End Source File
+@[end for]@
+# End Group
+@[end for]@
+# Begin Group "Headers"
+
+# PROP Default_Filter ""
+# Begin Group "Setup"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\wx\msw\setup.h
+
+!IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
+
+# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
+
+# Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswdll\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
+
+# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+
+# Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
+
+# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+@[for group in HEADERS]@
+# Begin Group "@group[0]"
+
+# PROP Default_Filter ""
+@[for hdr in group[1]]@
+# Begin Source File
+
+SOURCE=..\include\@hdr.replace('/','\\')
+# End Source File
+@[end for]@
+# End Group
+@[end for]@
+# End Group
+# End Target
+# End Project

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">
@@ -22,13 +22,6 @@
         <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 +32,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>
 
 
@@ -137,8 +115,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 +138,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 +157,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 +176,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 +214,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 +236,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 +247,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 +261,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 +283,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 +296,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 +308,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

@@ -38,6 +38,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_MACOSX=='1'">src/tiff/libtiff/tif_unix.c</if>
-        <if cond="PLATFORM_OS2=='1'">src/tiff/libtiff/tif_unix.c</if>
-        <if cond="PLATFORM_WIN32=='1'">src/tiff/libtiff/tif_win32.c</if>
-        <if cond="PLATFORM_MACOS=='1'">src/tiff/libtiff/tif_apple.c</if>
-        <if cond="PLATFORM_MSDOS=='1'">src/tiff/libtiff/tif_msdos.c</if>
+        <if cond="PLATFORM_UNIX=='1'">src/tiff/tif_unix.c</if>
+        <if cond="PLATFORM_MACOSX=='1'">src/tiff/tif_unix.c</if>
+        <if cond="PLATFORM_OS2=='1' and FORMAT!='watcom'">src/tiff/tif_unix.c</if>
+        <if cond="PLATFORM_OS2=='1' and FORMAT=='watcom'">src/tiff/tif_os2.c</if>
+        <if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.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/libtiff/tif_close.c
-            src/tiff/libtiff/tif_codec.c
-            src/tiff/libtiff/tif_color.c
-            src/tiff/libtiff/tif_compress.c
-            src/tiff/libtiff/tif_dir.c
-            src/tiff/libtiff/tif_dirinfo.c
-            src/tiff/libtiff/tif_dirread.c
-            src/tiff/libtiff/tif_dirwrite.c
-            src/tiff/libtiff/tif_dumpmode.c
-            src/tiff/libtiff/tif_error.c
-            src/tiff/libtiff/tif_extension.c
-            src/tiff/libtiff/tif_fax3.c
-            src/tiff/libtiff/tif_fax3sm.c
-            src/tiff/libtiff/tif_flush.c
-            src/tiff/libtiff/tif_getimage.c
-            src/tiff/libtiff/tif_jpeg.c
-            src/tiff/libtiff/tif_luv.c
-            src/tiff/libtiff/tif_lzw.c
-            src/tiff/libtiff/tif_next.c
-            src/tiff/libtiff/tif_ojpeg.c
-            src/tiff/libtiff/tif_open.c
-            src/tiff/libtiff/tif_packbits.c
-            src/tiff/libtiff/tif_pixarlog.c
-            src/tiff/libtiff/tif_predict.c
-            src/tiff/libtiff/tif_print.c
-            src/tiff/libtiff/tif_read.c
-            src/tiff/libtiff/tif_strip.c
-            src/tiff/libtiff/tif_swab.c
-            src/tiff/libtiff/tif_thunder.c
-            src/tiff/libtiff/tif_tile.c
-            src/tiff/libtiff/tif_version.c
-            src/tiff/libtiff/tif_warning.c
-            src/tiff/libtiff/tif_write.c
-            src/tiff/libtiff/tif_zip.c
+            src/tiff/tif_aux.c
+            src/tiff/tif_close.c
+            src/tiff/tif_codec.c
+            src/tiff/tif_color.c
+            src/tiff/tif_compress.c
+            src/tiff/tif_dir.c
+            src/tiff/tif_dirinfo.c
+            src/tiff/tif_dirread.c
+            src/tiff/tif_dirwrite.c
+            src/tiff/tif_dumpmode.c
+            src/tiff/tif_error.c
+            src/tiff/tif_extension.c
+            src/tiff/tif_fax3.c
+            src/tiff/tif_fax3sm.c
+            src/tiff/tif_getimage.c
+            src/tiff/tif_jpeg.c
+            src/tiff/tif_flush.c
+            src/tiff/tif_lzw.c
+            src/tiff/tif_luv.c
+            src/tiff/tif_next.c
+            src/tiff/tif_open.c
+            src/tiff/tif_packbits.c
+            src/tiff/tif_pixarlog.c
+            src/tiff/tif_predict.c
+            src/tiff/tif_print.c
+            src/tiff/tif_read.c
+            src/tiff/tif_swab.c
+            src/tiff/tif_strip.c
+            src/tiff/tif_thunder.c
+            src/tiff/tif_tile.c
+            src/tiff/tif_version.c
+            src/tiff/tif_warning.c
+            src/tiff/tif_write.c
+            src/tiff/tif_zip.c
         </sources>
     </lib>
 

build/bakefiles/wx.bkl

@@ -24,7 +24,7 @@
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
 
-    <if cond="FORMAT in ['msvc6prj','msevc4prj','msvs2005prj']">
+    <if cond="FORMAT in ['msvc6prj','msevc4prj']">
         <set var="MSVC6PRJ_MERGED_TARGETS">
             <if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
             <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
@@ -97,7 +97,7 @@
                 $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
                 $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
                 $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
-                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
             </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:
-
-    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>
-
+    FIXME: docs
 -->
 
 
 <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. 
-    -->
-    <set var="WX_PRESETS_VERSION">4</set>
+         this is changed only when major changes to wxpresets take place. -->
+    <set var="WX_PRESETS_VERSION">3</set>
 
-    <!-- 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>
-                         tag definitions.
-    -->
-    <set var="WX_LIB_LIST">
-        base core net xml odbc xrc html adv media gl dbgrid qa aui richtext stc
+    <!-- list of known libraries used by wx-lib tag defined in wx_unix.bkl and wx_win32.bkl -->
+    <set var="LIB_LIST">
+        base core net xml odbc xrc html adv media gl dbgrid qa aui richtext
     </set>
 
-    <!-- if you define this variable to 0 before including wx presets, the
-         "test_for_selected_wxbuild" target which is added by default in win32 and GNU 
-         makefiles, won't be added.
-         This is useful when e.g. you want to have wxWidgets as an optional
-         dependency and thus you don't want to perform that check unconditionally.
-    -->
-    <set var="WX_TEST_FOR_SELECTED_WXBUILD" overwrite="0">
-        1
-    </set>
+    <!-- NOTE: refer to the NET contrib using NETUTILS instead of NET
+               (which is already in LIB_LIST) -->
+    <set var="CONTRIBLIB_LIST">animate applet deprecated fl foldbar gizmos mmedia netutils ogl plot stc svg</set>
+    <set var="ALLLIB_LIST">$(LIB_LIST) $(CONTRIBLIB_LIST)</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
-        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).
+        AM_PATH_WXCONFIG in your configure.in!
 
 -->
 
 
 <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>
-
-        <set var="WX_PORT_DEFAULT" overwrite="0">
-            $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
-        </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 name="WX_CFLAGS">
+            <default-value>`$(DOLLAR)(WX_CONFIG) --cflags`</default-value>
+            <description>C flags to use with wxWidgets code</description>
         </option>
-
-        <set var="WX_SHARED_DEFAULT" overwrite="0">
-            $(DOLLAR)(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
-        </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 name="WX_CXXFLAGS">
+            <default-value>`$(DOLLAR)(WX_CONFIG) --cxxflags`</default-value>
+            <description>C++ flags to use with wxWidgets code</description>
         </option>
-
-        <set var="WX_UNICODE_DEFAULT" overwrite="0">
-            $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
-        </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 name="WX_CPPFLAGS">
+            <default-value>`$(DOLLAR)(WX_CONFIG) --cppflags`</default-value>
+            <description>C preprocessor flags to use with wxWidgets code</description>
         </option>
-
-        <set var="WX_DEBUG_DEFAULT" overwrite="0">
-            $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
-        </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 name="WX_RESCOMP">
+            <default-value>`$(DOLLAR)(WX_CONFIG) --rescomp`</default-value>
+            <description>wxWidgets resource compiler and flags</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>
-
-
-        <!-- 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>
+        <set var="FORMAT_OUTPUT_VARIABLES" append="1">WX_CONFIG</set>
     </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 -->
+            <ldlibs>$(WX_LIBS)</ldlibs>
+        </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>
+            <ldlibs>`$(WX_CONFIG) --libs $(','.join(__liblist.split()))`</ldlibs>
+        </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>

build/bakefiles/wxpresets/presets/wx_win32.bkl

@@ -10,8 +10,21 @@
 <!--                $Id$ -->
 
 
+<!--
+
+FIXME: this template has (at least) the following bugs:
+
+ * it's MSW-only, the port is assumed to be wxMSW unconditionally
+
+ * multiple wx configurations (CFG variable set when building the
+   library) are not supported
+
+-->
+
+<!-- makefile tag signifies the beginning of the bakefile           -->
 <makefile>
 
+    <requires version="0.1.5"/>
 
     <!--                        OPTIONS                             -->
     <!--                                                            -->
@@ -28,12 +41,77 @@
     <!--    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>
+
+
+    <!--    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>,DLL</values-description>
+            <default-value>$(WX_SHARED_DEFAULT)</default-value>
+            <description>
+                Use DLL build of wx library to use?
+            </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>,Unicode</values-description>
+            <default-value>$(WX_UNICODE_DEFAULT)</default-value>
+            <description>
+                Compile 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">28</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>
 
 
     <!--                     HELPER VARIABLES                       -->
@@ -57,6 +135,11 @@
     <!--    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>
     <set var="WX3RDPARTYLIBPOSTFIX">
         <if cond="WX_DEBUG=='1'">d</if>
     </set>
@@ -70,14 +153,11 @@
         <if cond="WX_SHARED=='1'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)$(WXCPU)_dll</if>
     </set>
 
-    <!-- under Unix this is an option (detected at configure-time);
-         under Windows this is not an user option! -->
-    <set var="WX_PORT">
+    <set var="WXPORT">
         <if cond="FORMAT=='msevc4prj'">wince</if>
         <if cond="FORMAT!='msevc4prj'">msw</if>
     </set>
-
-    <set var="WXLIBINCLUDE">$(WXLIBPATH)$(DIRSEP)$(WX_PORT)$(WXLIBPOSTFIX)</set>
+    <set var="WXLIBINCLUDE">$(WXLIBPATH)$(DIRSEP)$(WXPORT)$(WXLIBPOSTFIX)</set>
 
 
     <!--    All the possible mixes for the wx library names          -->
@@ -93,65 +173,94 @@
             WX_MONOLITHIC=1, then the base library is translated to the
             monolithic library
         -->
-        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WX_PORT)$(WX_VERSION)</if>
-        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WX_PORT)$(WX_VERSION)d</if>
-        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WX_PORT)$(WX_VERSION)u</if>
-        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WX_PORT)$(WX_VERSION)ud</if>
+        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)</if>
+        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d</if>
+        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u</if>
+        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud</if>
     </set>
 
-
     <!--   Libraries whose name is prefixed with 'wxbase'            -->
-    <define-global-tag name="define-wxbase-lib-name">
-        <set var="WXLIB_$(value.upper())_NAME">
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">
-                wxbase$(WX_VERSION)_$(value)
-            </if>
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">
-                wxbase$(WX_VERSION)d_$(value)
-            </if>
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">
-                wxbase$(WX_VERSION)u_$(value)
-            </if>
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">
-                wxbase$(WX_VERSION)ud_$(value)
-            </if>
+    <set var="WXLIB_NET_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)_net</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d_net</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u_net</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud_net</if>
+    </set>
+    <set var="WXLIB_XML_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)_xml</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d_xml</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u_xml</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud_xml</if>
+    </set>
+    <set var="WXLIB_ODBC_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)_odbc</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d_odbc</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u_odbc</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud_odbc</if>
     </set>
-    </define-global-tag>
-
-    <define-wxbase-lib-name>net</define-wxbase-lib-name>
-    <define-wxbase-lib-name>xml</define-wxbase-lib-name>
-    <define-wxbase-lib-name>odbc</define-wxbase-lib-name>
-
 
     <!--   Libraries whose name is prefixed with 'wx' only          -->
-    <define-global-tag name="define-wxlib-name">
-        <set var="WXLIB_$(value.upper())_NAME">
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">
-                wx$(WX_PORT)$(WX_VERSION)_$(value)
-            </if>
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">
-                wx$(WX_PORT)$(WX_VERSION)d_$(value)
-            </if>
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">
-                wx$(WX_PORT)$(WX_VERSION)u_$(value)
-            </if>
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">
-                wx$(WX_PORT)$(WX_VERSION)ud_$(value)
-            </if>
-        </set>
-    </define-global-tag>
+    <set var="WXLIB_CORE_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_core</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_core</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_core</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_core</if>
+    </set>
+    <set var="WXLIB_MEDIA_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_media</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_media</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_media</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_media</if>
+    </set>
+    <set var="WXLIB_XRC_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_xrc</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_xrc</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_xrc</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_xrc</if>
+    </set>
+    <set var="WXLIB_HTML_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_html</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_html</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_html</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_html</if>
+    </set>
+    <set var="WXLIB_ADV_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_adv</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_adv</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_adv</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_adv</if>
+    </set>
+    <set var="WXLIB_QA_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_qa</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_qa</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_qa</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_qa</if>
+    </set>
+    <set var="WXLIB_DBGRID_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_dbgrid</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_dbgrid</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_dbgrid</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_dbgrid</if>
+    </set>
+    <set var="WXLIB_GL_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_gl</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_gl</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_gl</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_gl</if>
+    </set>
+    <set var="WXLIB_AUI_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_aui</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_aui</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_aui</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_aui</if>
+    </set>
+    <set var="WXLIB_RICHTEXT_NAME">
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_richtext</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_richtext</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_richtext</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_richtext</if>
+    </set>
 
-    <define-wxlib-name>core</define-wxlib-name>
-    <define-wxlib-name>media</define-wxlib-name>
-    <define-wxlib-name>xrc</define-wxlib-name>
-    <define-wxlib-name>html</define-wxlib-name>
-    <define-wxlib-name>adv</define-wxlib-name>
-    <define-wxlib-name>qa</define-wxlib-name>
-    <define-wxlib-name>dbgrid</define-wxlib-name>
-    <define-wxlib-name>gl</define-wxlib-name>
-    <define-wxlib-name>aui</define-wxlib-name>
-    <define-wxlib-name>stc</define-wxlib-name>
-    <define-wxlib-name>richtext</define-wxlib-name>
 
 
 
@@ -194,14 +303,13 @@
         <if cond="value=='aui'"><sys-lib>$(WXLIB_AUI_NAME)</sys-lib></if>
         <if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if>
 
-        <if cond="value=='stc'">
-            <!-- wxSTC requires also the basic scintilla library
-                 which is built as a separate 3rd party library -->
-            <sys-lib>$(WXLIB_STC_NAME)</sys-lib>
-            <sys-lib>wxscintilla$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
+        <!-- wx-lib can be used also to link against contrib libraries
+             (which always have the same name, regardless of WX_MONOLITHIC value) -->
+        <if cond="value in CONTRIBLIB_LIST.split()">
+            <sys-lib>wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
         </if>
 
-        <if cond="value not in WX_LIB_LIST.split()">
+        <if cond="value not in ALLLIB_LIST.split()">
             <error>Unknown wxWidgets library given in the wx-lib tag</error>
         </if>
     </define-tag>
@@ -223,8 +331,6 @@
             <ldflags>-mthreads</ldflags>
         </if>
 
-        <define>$(substituteFromDict(WX_SHARED,{'1':'WXUSINGDLL','0':''}))</define>
-
         <define>$(WXUNICODE_DEFINE)</define>
         <define>$(WXDEBUG_DEFINE)</define>
         <define>__WXMSW__</define>
@@ -291,32 +397,4 @@
         <__wx-syslibs/>
     </template>
 
-    <if cond="FORMAT_SUPPORTS_ACTIONS=='1' and WX_TEST_FOR_SELECTED_WXBUILD=='1'">
-
-        <!--
-            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 printing the following nice error message...
-                            (much better than the 'could not find wx/*.h file')
-        -->
-        <action id="test_for_selected_wxbuild">
-            <dependency-of>all</dependency-of>
-
-            <!-- the @ is to hide these actions from the user -->
-            <command>
-                @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
-                    echo ----------------------------------------------------------------------------
-                @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
-                    echo The selected wxWidgets build is not available!
-                @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
-                    echo Please use the options prefixed with WX_ to select another wxWidgets build.
-                @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
-                    echo ----------------------------------------------------------------------------
-                @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
-                    exit 1
-            </command>
-        </action>
-    </if>
-
 </makefile>

build/bakefiles/wxpresets/sample/minimal.bkl

@@ -7,9 +7,6 @@
 
     <exe id="minimal" template="wx">
         <app-type>gui</app-type>
-
-        <!-- this sample builds always in debug mode; if you have
-             compiled wxWidgets in release mode, you'll get link errors! -->
         <debug-info>on</debug-info>
         <runtime-libs>dynamic</runtime-libs>
         

build/bakefiles/wxwin.py

@@ -40,11 +40,10 @@ def mk_wxid(id):
 
 # All libs that are part of the main library (i.e. non-contrib):
 MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
-             'media', 'odbc', 'qa', 'dbgrid', 'xrc', 'aui', 'richtext', 'stc']
+             'media', 'odbc', 'qa', 'dbgrid', 'xrc', 'aui', 'richtext']
 # List of library names/ids for categories with different names:
 LIBS_NOGUI = ['xml', 'net', 'odbc']
-LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'qa', 'dbgrid', 'xrc', 'media',
-              'aui', 'richtext', 'stc']
+LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'qa', 'dbgrid', 'xrc', 'media', 'aui', 'richtext']
 # Additional libraries that must be linked in:
 EXTRALIBS = {
     'gl' : '$(EXTRALIBS_OPENGL)',

build/buildbot/config/common.xml

@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       common.xml
-    Purpose:    Schedulers and locks common to all slaves.
-    Author:     Mike Wetherell
-    RCS-ID:     $Id$
-    Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWidgets licence
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude"
-     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-     xmlns:exsl="http://exslt.org/common"
-     xsl:version="1.0">
-
-<xi:include href="include.xml" xpointer="xpointer(*/*)"/>
-
-<!--
-    Quick schedulers. Builds using these are triggered after each change to
-    the sources on the given branch.
-
-    name:               unique
-    branch:             branch to watch
-    treeStableTimer:    wait until the tree has stopped changing for the
-                        given number of seconds before firing
-    fileNotImportant:   files matching these patterns do not trigger a build
--->
-
-<scheduler>
-    <name>trunk_quick</name>
-    <branch>trunk</branch>
-    <treeStableTimer>900</treeStableTimer>
-    <fileNotImportant>doc/*</fileNotImportant>
-</scheduler>
-
-<scheduler>
-    <name>stable_quick</name>
-    <branch><STABLE_BRANCH/></branch>
-    <treeStableTimer>900</treeStableTimer>
-    <fileNotImportant>doc/*</fileNotImportant>
-</scheduler>
-
-<!--
-    Schedulers that fire once a week.
-
-    A build can use one of these to be triggered once a week, or more than
-    one if it should run several times a week on particular days.
--->
-
-<nightly>
-    <name>sunday_6am</name>
-    <hour>6</hour>
-    <dayOfWeek>0</dayOfWeek>
-</nightly>
-
-<nightly>
-    <name>monday_6am</name>
-    <hour>6</hour>
-    <dayOfWeek>1</dayOfWeek>
-</nightly>
-
-<nightly>
-    <name>tuesday_6am</name>
-    <hour>6</hour>
-    <dayOfWeek>2</dayOfWeek>
-</nightly>
-
-<nightly>
-    <name>wednesday_6am</name>
-    <hour>6</hour>
-    <dayOfWeek>3</dayOfWeek>
-</nightly>
-
-<nightly>
-    <name>thursday_6am</name>
-    <hour>6</hour>
-    <dayOfWeek>4</dayOfWeek>
-</nightly>
-
-<nightly>
-    <name>friday_6am</name>
-    <hour>6</hour>
-    <dayOfWeek>5</dayOfWeek>
-</nightly>
-
-<nightly>
-    <name>saturday_6am</name>
-    <hour>6</hour>
-    <dayOfWeek>6</dayOfWeek>
-</nightly>
-
-<!--
-    Schedulers for daily builds.
--->
-
-<nightly>
-    <name>daily_6am</name>
-    <hour>6</hour>
-</nightly>
-
-<!--
-    Track SVN changes using the wx-cvs mailing list.
-    The <prefix> is subtracted from the paths in the 'Modified Files:'
-    section, the remainder is then assumed to give the branch and filename.
--->
-
-<svnmaildirsource>
-    <prefix>wxWidgets</prefix>
-</svnmaildirsource>
-
-</bot>

build/buildbot/config/example.xml

@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       example.xml
-    Purpose:    Buildbot example configuration.
-    Author:     Mike Wetherell
-    RCS-ID:     $Id$
-    Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWidgets licence
-
-    There is one xml file such as this per build slave containing a <build>
-    element for each build the slave runs. Each <build> corresponds to a
-    column in the waterfall display.
-
-    For full documentation see:
-    http://www.wxwidgets.org/wiki/index.php/Development:_Buildbot
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude"
-     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-     xmlns:exsl="http://exslt.org/common"
-     xsl:version="1.0">
-
-<!--
-    Common declarations.
--->
-<xi:include href="include.xml" xpointer="xpointer(*/*)"/>
-
-<!--
-    Notes:
-
-    The elements marked 'Unique' below must be unique across all builds on
-    all slaves.
-
-    If a build is currently failing because of something other than a bug in
-    wxWidgets, e.g. out of space or missing libs, then comment it out, or
-    add '** Ignore **' to the beginning of the <name>, so that wxWidgets
-    developers know not to waste time investigating.
--->
-<build>
-    <!--
-        Unique. Appears as the title in the waterfall display.
-    -->
-    <name>Linux x86_64 wxGTK Stable</name>
-
-    <!--
-        Unique. The name of a directory for the bulid. On most slaves must
-        be a single name, on the Testdrive builds it must be a path such as
-        '/tmp/wx/td_gtk'.
-    -->
-    <builddir>example_gtk</builddir>
-
-    <!--
-        The name of a scheduler that will trigger this build. The schedulers
-        are usually defined in common.xml, look in there to see if there is
-        already one you can use, and add a new one if not.
-
-        The 'trunk_quick' and 'stable_quick' schedulers currently in
-        common.xml trigger a build after every source change on the trunk
-        and stable branches respectively. There are also daily and weekly
-        schedulers 'daily_6am', 'monday_6am', 'tuesday_6am' and so on.
-
-        The <scheduler> element can be omitted, in which case the build
-        never runs automatically, but can still be triggered manually.
-        Or you can use several, e.g. you could use two weekly schedulers
-        that fire on different days to have a build run twice a week.
-    -->
-    <scheduler>trunk_quick</scheduler>
-
-    <!--
-        The meaning of <sandbox> is specific to the build slave. There
-        should be a comment in the slave's configuration file saying if they
-        are allowed or required. On the testdrive it specifies the remote
-        machine that will run the bulid.
-    -->
-    <sandbox>debug</sandbox>
-
-    <!--
-        You can override the make command the compile steps will use using
-        this <make> element, if omitted defaults to 'make'. For Windows
-        builds this becomes the place to put build options as there is no
-        configure step.
-    -->
-    <make>nmake -f makefile.vc SHARED=1 CPPUNIT_CFLAGS=-I\cppunit\include CPPUNIT_LIBS=cppunit.lib</make>
-
-    <!--
-        The build steps.
-    -->
-    <steps>
-        <!--
-            Check out the sources, by default the trunk branch. Or for a
-            particular branch or tag, e.g.:
-                <checkout branch="{$STABLE_BRANCH}"/>
-                <checkout branch="branches/WX_2_6_BRANCH"/>
-        -->
-        <checkout/>
-
-        <!--
-            A <shellcommand> build step can be used anywhere you need to run
-            arbitrary commands not covered by the standard build steps.
-            <haltOnFailure/> specifies that the whole build fails if this
-            step fails, without it it continues with the next step anyway.
-        -->
-        <shellcommand>
-            <description>setting up</description>
-            <descriptionDone>set up</descriptionDone>
-            <haltOnFailure/>
-            <command>setup-script</command>
-        </shellcommand>
-
-        <!--
-            Configure. Options and environment variables can be added with
-            the 'options' attribute:
-                <configure options="-with-foobar CC=cc CXX=CC"/>
-            Omitted for Windows builds.
-        -->
-        <configure/>
-
-        <!--
-            Compile the library. For Windows builds use <compile-msw/>
-            instead which runs the make command in the 'build\msw'
-            subdirectory instead of the wxWidgets root.
-        -->
-        <compile/>
-
-        <!--
-            Compile subdirectories. There is also <compile-contrib/> for
-            branches that have contrib.
-        -->
-        <compile-samples/>
-        <compile-utils/>
-        <compile-tests/>
-
-        <!--
-            Run the test suites. For Windows builds the command to run the
-            test suite must be overridden, e.g.:
-                <run-tests>
-                    <command>PATH=..\lib\vc_dll;%PATH%</command>
-                    <command>cd tests</command>
-                    <command>vc_msw\test</command>
-                    <command>vc_msw\test_gui</command>
-                </run-tests>
-        -->
-        <run-tests/>
-    </steps>
-</build>
-
-</bot>

build/buildbot/config/include.xml

@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       include.xml
-    Purpose:    Common declarations for buildbot
-    Author:     Mike Wetherell
-    RCS-ID:     $Id$
-    Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWidgets licence
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude"
-     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-     xmlns:exsl="http://exslt.org/common"
-     xsl:version="1.0">
-
-<!--
-    Constants
--->
-<xsl:template name="SVN_URL">http://svn.wxwidgets.org/svn/wx/wxWidgets/</xsl:template>
-<xsl:template name="STABLE_BRANCH">branches/WX_2_8_BRANCH</xsl:template>
-<xsl:variable name="STABLE_BRANCH"><STABLE_BRANCH/></xsl:variable>
-
-<!--
-    checkout - build step for source checkout.
-
-    Usage: as <svn> with defaults for <baseURL> and <defaultBranch>
-
-    Typically just:
-        <checkout/>
-    for the trunk, or:
-        <checkout branch="branches/WX_2_8_BRANCH"/>
-    to checkout a branch.
--->
-<xsl:template name="checkout">
-    <xsl:param name="content"/>
-    <xsl:param name="branch" select="'trunk'"/>
-    <xsl:variable name="nodes" select="exsl:node-set($content)"/>
-    <svn>
-        <xsl:if test="not($nodes/svnurl)">
-            <xsl:if test="not($nodes/baseURL)">
-                <baseURL><SVN_URL/></baseURL>
-            </xsl:if>
-            <xsl:if test="not($nodes/defaultBranch)">
-                <defaultBranch><xsl:value-of select="$branch"/></defaultBranch>
-            </xsl:if>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-    </svn>
-</xsl:template>
-
-<!--
-    configure - add the options attribute to <configure>
-
-    Usage: <configure options="-with-foobar"/>
--->
-<xsl:template name="configure">
-    <xsl:param name="content"/>
-    <xsl:param name="options"/>
-    <configure>
-        <copy-with-defaults content="{$content}">
-            <command>./configure <xsl:value-of select="$options"/></command>
-        </copy-with-defaults>
-    </configure>
-</xsl:template>
-
-<!--
-    make - specify the make command.
-
-    Usage: <make>nmake -f makefile.vc SHARED=1</make>
-
-    Used as a child of <build> to specify the make command used by the
-    <compile> elements below, if omitted 'make' is used.
--->
-<xsl:template name="make"/>
-
-<!--
-    compile - modifiy <compile> to default to the command given by <make>
-
-    Usage: as <compile>
-
-    The <make> element of <build> spcecifies the make command used by all
-    compile build steps in the build. If <make> is not given 'make' is used.
-
-    The command for a particular compile build step can be further overridden
-    using its <command> element:
-        <compile>
-            <command>myscript</command>
-        </compile>
--->
-<xsl:template name="compile">
-    <xsl:param name="content"/>
-    <compile>
-        <copy-with-defaults content="{$content}">
-            <command><get name="make" default="make"/></command>
-        </copy-with-defaults>
-    </compile>
-</xsl:template>
-
-<!--
-    Compile build steps for the usual subdirectories.
-
-    Usage: as <compile>
-
-    Typically just:
-        <compile-msw/>
-        <compile-samples/>
-        <compile-utils/>
-        <compile-contrib/>
-        <compile-tests/>
-
-    By default the compile command produced is:
-        cd foobar && make
-    As above, the 'make' part can be overridden using the <make> element or
-    the whole command line can be replaced using <command>.
-
-    <compile-msw> and <compile-tests> halt the build on failure, the others
-    continue with the next step (can be overridden by <haltOnFailure>).
--->
-<xsl:template name="compile-msw">
-    <xsl:param name="content"/>
-    <compile-subdir dir="build\msw" halt="true">
-        <xsl:copy-of select="$content"/>
-    </compile-subdir>
-</xsl:template>
-
-<xsl:template name="compile-samples">
-    <xsl:param name="content"/>
-    <compile-subdir dir="samples">
-        <xsl:copy-of select="$content"/>
-    </compile-subdir>
-</xsl:template>
-
-<xsl:template name="compile-utils">
-    <xsl:param name="content"/>
-    <compile-subdir dir="utils">
-        <xsl:copy-of select="$content"/>
-    </compile-subdir>
-</xsl:template>
-
-<xsl:template name="compile-contrib">
-    <xsl:param name="content"/>
-    <compile-subdir dir="contrib">
-        <xsl:copy-of select="$content"/>
-    </compile-subdir>
-</xsl:template>
-
-<xsl:template name="compile-tests">
-    <xsl:param name="content"/>
-    <compile-subdir dir="tests" halt="true">
-        <xsl:copy-of select="$content"/>
-    </compile-subdir>
-</xsl:template>
-
-<!--
-    compile-subdir - build step to compile a subdirectory.
-
-    Usage: as <compile> plus the following attributes,
-           <compile-subdir dir="foobar" [ halt="true" ]/>
-
-    Compiles the named subdirectory 'foobar'. Continues with the next build
-    step on failure, unless the optional attibute 'halt="true"' is given.
-    The make command used is as described for the compile steps above.
--->
-<xsl:template name="compile-subdir">
-    <xsl:param name="content"/>
-    <xsl:param name="dir"/>
-    <xsl:param name="halt" select="'false'"/>
-    <compile>
-        <defaults content="{$content}">
-            <name>
-                compile <xsl:value-of select="$dir"/>
-            </name>
-            <description>
-                compiling <xsl:value-of select="$dir"/>
-            </description>
-            <descriptionDone>
-                compile <xsl:value-of select="$dir"/>
-            </descriptionDone>
-            <haltOnFailure>
-                <xsl:value-of select="$halt"/>
-            </haltOnFailure>
-            <warnOnFailure/>
-        </defaults>
-        <copy-with-defaults content="{$content}">
-            <command>cd <xsl:value-of select="$dir"/> &amp;&amp; <get name="make" default="make"/></command>
-        </copy-with-defaults>
-    </compile>
-</xsl:template>
-
-<!--
-    run-tests - build step to run the test suites.
-
-    Usage: as <test>
-
-    For unix builds typically just:
-        <run-tests/>
-    or for Windows builds, e.g.:
-        <run-tests>
-            <command>PATH=..\lib\vc_lib;%PATH%</command>
-            <command>cd tests &amp;&amp; vc_msw\test</command>
-        </run-tests>
--->
-<xsl:template name="run-tests">
-    <xsl:param name="content"/>
-    <test>
-        <defaults content="{$content}">
-            <description>running tests</description>
-            <descriptionDone>run tests</descriptionDone>
-            <warnOnFailure/>
-        </defaults>
-        <copy-with-defaults content="{$content}">
-            <command><xi:include href="run-tests.sh" parse="text"/></command>
-        </copy-with-defaults>
-    </test>
-</xsl:template>
-
-<!--
-    defaults - supply default content for an element.
-
-    Usage: <defaults content="{$content}">
-               <foo>foo</foo>
-               <bar>bar</bar>
-           </defaults>
-
-    Copies those child elements that do not already exist in $content.
--->
-<xsl:template name="defaults">
-    <xsl:param name="defaults"/>
-    <xsl:param name="content"/>
-
-    <xsl:variable name="def-nodes" select="exsl:node-set($defaults)"/>
-    <xsl:variable name="cont-nodes" select="exsl:node-set($content)"/>
-
-    <xsl:for-each select="$def-nodes/*">
-        <xsl:if test="not($cont-nodes/*[name() = name(current())])">
-            <xsl:copy-of select="."/>
-        </xsl:if>
-    </xsl:for-each>
-</xsl:template>
-
-<!--
-    copy-with-defaults - copy elements supplying defaults for any that are
-                         missing or empty.
-
-    Usage: <copy-with-defaults content="{$content}">
-               <foo>foo</foo>
-               <bar>bar</bar>
-           </copy-with-defaults>
-
-    Copies $content plus any child elements that do not exist in $content,
-    substituting empty elements in $content with any child elements of the
-    same name.
--->
-<xsl:template name="copy-with-defaults">
-    <xsl:param name="defaults"/>
-    <xsl:param name="content"/>
-
-    <xsl:variable name="def-nodes" select="exsl:node-set($defaults)"/>
-    <xsl:variable name="cont-nodes" select="exsl:node-set($content)"/>
-
-    <xsl:for-each select="$def-nodes/*">
-        <xsl:if test="not($cont-nodes/*[name() = name(current())])">
-            <xsl:copy-of select="."/>
-        </xsl:if>
-    </xsl:for-each>
-
-    <xsl:for-each select="$cont-nodes/*">
-        <xsl:choose>
-            <xsl:when test="not(node())">
-                <xsl:copy-of select="$def-nodes/*[name() = name(current())]"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:copy-of select="."/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:for-each>
-</xsl:template>
-
-<!--
-    get - gets the value of a named element inside a <build>.
-
-    Usage: <get name="foobar" [ default="value" ]/>
-
-    Used inside a <build> evaluates to the value of the build's <foobar>
-    element, or to the value of the optional 'default' attribute if there is
-    no such element.
--->
-<xsl:template name="get">
-    <xsl:param name="content"/>
-    <xsl:param name="name"/>
-    <xsl:param name="default"/>
-    <strip>
-        <xsl:choose>
-            <xsl:when test="ancestor-or-self::build/*[name() = $name]">
-                <xsl:apply-templates select="ancestor-or-self::build/*[name() = $name]/node()"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="$default"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </strip>
-</xsl:template>
-
-<!--
-    strip - strips leading and trailing whitespace
-
-    Usage: <strip>
-               foobar
-           </strip>
-
-    Strips leading and trailing whitespace if the content is text only,
-    otherwise copies the content unchanged.
--->
-<xsl:template name="strip">
-    <xsl:param name="content"/>
-    <xsl:variable name="len" select="string-length($content)"/>
-    <xsl:variable name="norm" select="normalize-space($content)"/>
-    <xsl:variable name="normlen" select="string-length($norm)"/>
-    <xsl:choose>
-        <xsl:when test="exsl:node-set($content)/*">
-            <xsl:copy-of select="$content"/>
-        </xsl:when>
-        <xsl:when test="substring($content, 1, 1) != substring($norm, 1, 1)">
-            <xsl:call-template name="strip">
-                <xsl:with-param name="content" select="substring($content, 2)"/>
-            </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="substring($content, $len, 1) != substring($norm, $normlen, 1)">
-            <xsl:call-template name="strip">
-                <xsl:with-param name="content" select="substring($content, 1, $len - 1)"/>
-            </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="$content"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-</bot>

build/buildbot/config/run-tests.sh

@@ -1,29 +0,0 @@
-# Run the test suites
-# Running them one at a time gives more readable results and shows up errors
-# in the suite names.
-set -e
-cd tests
-
-case `uname -sm` in
-    CYGWIN*|MINGW32*)   PATH=../lib:$PATH ;;
-    Darwin*)            DYLD_LIBRARY_PATH=../lib:$DYLD_LIBRARY_PATH ;;
-    *)                  LD_LIBRARY_PATH=../lib:$LD_LIBRARY_PATH ;;
-esac
-
-test -x test_gui && TEST_GUI=./test_gui
-ERR=0
-
-for prog in ./test $TEST_GUI; do
-    if [ -x $prog ]; then
-        SUITES=`$prog -l | grep '^  [^ ]'`
-        for SUITE in $SUITES; do
-            echo
-            echo $SUITE
-            echo $SUITE | sed 's/./-/g'
-            $prog $SUITE || ERR=1
-            echo
-        done
-    fi
-done
-
-exit $ERR

build/buildbot/config/testdrive-inc.xml

@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       testdrive-inc.xml
-    Purpose:    Declarations for the testdrive build slave
-    Author:     Mike Wetherell
-    RCS-ID:     $Id$
-    Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWidgets licence
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude"
-     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-     xmlns:exsl="http://exslt.org/common"
-     xsl:version="1.0">
-
-<xi:include href="include.xml" xpointer="xpointer(*/*)"/>
-
-<!--
-    checkout - build step for source checkout.
-
-    Usage: as <svn> with additional <command> element and defaults for
-           <baseURL> and <defaultBranch>
-
-    Typically just:
-        <checkout/>
-    for the trunk, or:
-        <checkout branch="branches/WX_2_8_BRANCH"/>
-    to checkout a branch.
--->
-<xsl:template name="checkout">
-    <xsl:param name="content"/>
-    <xsl:param name="branch" select="'trunk'"/>
-    <xsl:variable name="nodes" select="exsl:node-set($content)"/>
-    <testdrive-svn>
-        <xsl:if test="not($nodes/svnurl)">
-            <xsl:if test="not($nodes/baseURL)">
-                <baseURL><SVN_URL/></baseURL>
-            </xsl:if>
-            <xsl:if test="not($nodes/defaultBranch)">
-                <defaultBranch><xsl:value-of select="$branch"/></defaultBranch>
-            </xsl:if>
-        </xsl:if>
-        <xsl:if test="not($nodes/command)">
-            <profile/>
-            <post-checkout/>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-    </testdrive-svn>
-</xsl:template>
-
-<xsl:template name="post-checkout">
-<command>
-mkdir -p $TOPDIR
-chown $USER $TOPDIR
-rm -rf $BUILDDIR
-cp -pR . $BUILDDIR || { cd; rm -rf $BUILDDIR; exit 1; }
-</command>
-</xsl:template>
-
-<!--
-    configure - make disable-precomp-headers a default configure option for
-                the testdrive, and post process the Makefiles to use ccache.
-
-    Usage: <configure options="-with-foobar"/>
--->
-<xsl:template name="configure">
-    <xsl:param name="content"/>
-    <xsl:param name="options"/>
-    <configure>
-        <copy-with-defaults content="{$content}">
-            <command>./configure --disable-precomp-headers <xsl:value-of select="$options"/></command>
-        </copy-with-defaults>
-        <command>find . -name Makefile | xargs perl -pi -e 's/^(?:CC|CXX) = /$&amp;ccache /'</command>
-    </configure>
-</xsl:template>
-
-<!--
-    setup - a build step that makes sure any prerequisites are set up for
-            the current testdrive build.
-
-    Usage: <setup/>
-           <setup cppunit-options="-host=i686-apple-darwin8"/>
-
-    One of the things it sets up is cppunit. There is more than one compiler
-    available on some of the testdrive machines, and generally speaking
-    cppuint needs to be compiled by the same one that will be used for the
-    build.
--->
-<xsl:template name="setup">
-<xsl:param name="content"/>
-<xsl:param name="options"/>
-<xsl:param name="ccache-configure" select="'./configure INSTALL=./install-sh\ -c --prefix=$HOME --bindir=$OPTDIR/bin'"/>
-<xsl:param name="ccache-options"/>
-<xsl:param name="cppunit-configure" select="'./configure INSTALL=config/install-sh\ -c --prefix=$HOME --bindir=$OPTDIR/bin --libdir=$OPTDIR/lib --disable-static'"/>
-<xsl:param name="cppunit-options"/>
-<shellcommand>
-<description>setting up</description>
-<descriptionDone>set up</descriptionDone>
-<haltOnFailure/>
-<command>
-MINSPACE=1000000
-DSPACE=`df -Pk $BUILDDIR | tail -1 | awk '{ print $4 }'`
-if [ $DSPACE -lt $MINSPACE ]; then
-    echo "Disk space low, skipping build"
-    exit 1
-fi
-if [ -z "$CCACHE_DIR" ]; then
-    gunzip -c $HOME/src/ccache-*.tar.gz | tar xf -
-    cd ccache-*
-    <xsl:value-of select="concat($ccache-configure, ' ', $ccache-options, ' ', $options)"/>
-    make
-    strip ccache
-    make install
-    cd $BUILDDIR
-    rm -r ccache-*
-fi
-if { cppunit-config --version || "$CPPUNIT_CONFIG" --version; } 2>/dev/null; then
-    HAVE_CPPUNIT=1
-fi
-if [ -z "$HAVE_CPPUNIT" ]; then
-    gunzip -c $HOME/src/cppunit-*.tar.gz | tar xf -
-    cd cppunit-*
-    <xsl:value-of select="concat($cppunit-configure, ' ', $cppunit-options, ' ', $options)"/>
-    make install-strip
-    chmod +x $OPTDIR/bin/cppunit-config
-    cd $BUILDDIR
-    rm -rf cppunit-*
-fi
-</command>
-</shellcommand>
-</xsl:template>
-
-<!--
-    builddir - override <builddir> to accept a full path
-
-    Usage: <builddir>/tmp/wx/foobar</builddir>
-
-    Normally builddir is a single directory name not a full path. Override
-    to allow a working directory to be selected on the remote testdrive
-    machine.
-
-    The actual builddir (i.e. last part 'foobar') as usual must be unique
-    across all the builds of all the slaves.
--->
-<xsl:template name="builddir">
-    <xsl:param name="content"/>
-    <builddir>
-        <basename><xsl:copy-of select="$content"/></basename>
-    </builddir>
-</xsl:template>
-
-<!--
-    steps - overrides <steps> to prepend <profile/> and <prologue/> and
-            append <epilogue/> to the <command/> of each build step.
-
-    Usage: as <steps>
-
-    The differences between <profile/> and <prologue/> are:
-    1. <profile/> is also used by <checkout> for its post checkout command,
-       <proglogue/> isn't.
-    2. <profile/> has access to the build's fields, for example it can
-       use <get name="builddir"/>, while <prologue/> can't.
--->
-<xsl:template name="steps">
-    <xsl:param name="content"/>
-    <xsl:variable name="profile"><profile/></xsl:variable>
-    <steps>
-        <xsl:for-each select="exsl:node-set($content)/*">
-            <xsl:choose>
-                <xsl:when test="contains(name(), 'svn')">
-                    <xsl:copy-of select="."/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:copy>
-                        <xsl:copy-of select="@*"/>
-                        <xsl:copy-of select="$profile"/>
-                        <prologue/>
-                        <xsl:copy-of select="node()"/>
-                        <xsl:if test="not(command)">
-                            <command/>
-                        </xsl:if>
-                        <epilogue/>
-                    </xsl:copy>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:for-each>
-    </steps>
-</xsl:template>
-
-<!--
-    profile - see <steps> above.
--->
-<xsl:template name="profile">
-<command>
-set -e
-uname -smnr
-umask 022
-LANG=C
-TOPDIR=<get name="builddir"/>
-BUILDDIR=$TOPDIR/build
-OPTDIR=$HOME/opt/<basename><get name="builddir"/></basename>
-</command>
-</xsl:template>
-
-<!--
-    prologue - see <steps> above.
--->
-<xsl:template name="prologue">
-<command>
-INSTALLDIR=$TOPDIR/install
-case `uname -sm` in
-    Linux*86*) PATH=$HOME/linux-x86/bin:$PATH ;;
-esac
-PATH=$OPTDIR/bin:$PATH
-LD_LIBRARY_PATH=$BUILDDIR/lib:$OPTDIR/lib:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
-if { ccache -V; } >/dev/null 2>&amp;1; then
-    CCACHE_DIR=$TOPDIR/ccache
-    export CCACHE_DIR
-    ccache -M 90M
-fi
-cd $BUILDDIR
-<if-del-on-fail>trap 'cd; rm -rf $BUILDDIR' EXIT</if-del-on-fail>
-</command>
-</xsl:template>
-
-<!--
-    epilogue - see <steps> above.
--->
-<xsl:template name="epilogue">
-    <xsl:if test="position() != last()">
-        <if-del-on-fail>
-            <command>trap '' EXIT</command>
-        </if-del-on-fail>
-    </xsl:if>
-</xsl:template>
-
-<!--
-    if-del-on-fail - used in the context of a build step, copies its content
-                     if the build step should cleanup on failure.
-
-    Usage: <if-del-on-fail>foobar</if-del-on-fail>
-
-    On the testdrive the working directory is deleted after a build to save
-    space. If the step has <haltOnFailure/> (which is the default or
-    <configure> and <compile> steps) then this cleanup needs to happen
-    whenever the step fails.
--->
-<xsl:template name="if-del-on-fail">
-    <xsl:param name="content"/>
-    <xsl:if test = "position() = last() or
-                    haltOnFailure = '' or
-                    haltOnFailure = 'true' or
-                    (not(haltOnFailure) and
-                        (name() = 'configure' or name() = 'compile'))">
-        <xsl:copy-of select="$content"/>
-    </xsl:if>
-</xsl:template>
-
-<!--
-    Add slave locks so that each testdrive machine only runs one bulid at a
-    time
--->
-<xsl:for-each select="../build/sandbox">
-    <xsl:if test="not(../preceding-sibling::build[sandbox = current()])">
-        <slavelock>
-            <name><xsl:apply-templates select="node()"/></name>
-        </slavelock>
-    </xsl:if>
-</xsl:for-each>
-
-<xsl:template name="sandbox">
-    <xsl:param name="content"/>
-    <sandbox><xsl:copy-of select="$content"/></sandbox>
-    <lock><xsl:copy-of select="$content"/></lock>
-</xsl:template>
-
-<!--
-    basename - returns the final component of a path
-
-    Usage: <basename>/foo/bar</basename>
-
-    Evaluates to 'bar'.
--->
-<xsl:template name="basename">
-    <xsl:param name="path"/>
-    <xsl:choose>
-        <xsl:when test="contains($path, '/')">
-            <xsl:call-template name="basename">
-                <xsl:with-param name="path" select="substring-after($path, '/')"/>
-            </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="$path"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-</bot>

build/buildbot/config/testdrive.xml

@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       testdrive.xml
-    Purpose:    Buildbot configuration for the HP Testdrive.
-    Author:     Mike Wetherell
-    RCS-ID:     $Id$
-    Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWidgets licence
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude"
-     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-     xmlns:exsl="http://exslt.org/common"
-     xsl:version="1.0">
-
-<xi:include href="testdrive-inc.xml" xpointer="xpointer(*/*)"/>
-
-<!--
-    Notes:
-
-    The list of available machines is here:
-        http://www.testdrive.hp.com/current.shtml
-    Currently only unix hosts are supported, with hopefully one or more
-    Windows machines to follow.
-
-    <sandbox> specifies the remote machine that will run the job, or it can
-    be 'debug' in which case the sandbox will just echo the commands.
-
-    <builddir> specifies an absolute path on the remote machine for the
-    build, rather than the usual single directory name. The last component
-    also specifies a subdirectory on the master for logs, which as usual
-    must be unique across all slaves.
-
-    An extra build step <setup> can be used after <checkout> to set up ccache
-    and cppunit. Cppunit generally needs to be compiled by the same compiler
-    that will be used for wxWidgets, add configure options using the
-    'cppunit-options' attribute when needed, e.g.:
-        <setup cppunit-options="CC=cc CXX=CC"/>
-
-    Cross compilers available on the Linux x86 machines (more coming):
-        powerpc-apple-darwin8
-        i686-apple-darwin8
-        i386-mingw32    (with cppunit installed under $HOME/opt/mingw345)
-
-    Please limit the number of quick builds to one unix, one Windows and one
-    Mac per branch. And please don't load up all the cpus of a remote machine
-    at once with make -j.
--->
-
-<!-- 
-    Unix Quick Builds
--->
-
-<build>
-    <name>Linux x86_64 wxGTK Trunk</name>
-    <sandbox>td162.testdrive.hp.com</sandbox>
-    <builddir>/tmp/wx/td_gtk</builddir>
-    <scheduler>trunk_quick</scheduler>
-
-    <steps>
-        <checkout/>
-
-        <setup/>
-        <configure/>
-
-        <compile/>
-        <compile-samples/>
-        <compile-utils/>
-        <compile-tests/>
-
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux x86_64 wxGTK Stable</name>
-    <sandbox>td166.testdrive.hp.com</sandbox>
-    <builddir>/tmp/wx/td_gtk_stable</builddir>
-    <scheduler>stable_quick</scheduler>
-
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-
-        <setup/>
-        <configure/>
-
-        <compile/>
-        <compile-samples/>
-        <compile-utils/>
-        <compile-contrib/>
-        <compile-tests/>
-
-        <run-tests/>
-    </steps>
-</build>
-
-<!-- 
-    Mac Quick Builds
--->
-
-<build>
-    <name>OSX PowerPC wxMac Trunk</name>
-    <sandbox>td179.testdrive.hp.com</sandbox>
-    <builddir>/tmp/wx/td_mac</builddir>
-    <scheduler>trunk_quick</scheduler>
-
-    <steps>
-        <checkout/>
-
-        <setup cppunit-options="--host=powerpc-apple-darwin8"/>
-        <configure options="--host=powerpc-apple-darwin8"/>
-
-        <compile/>
-        <compile-samples/>
-        <compile-utils/>
-        <compile-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>OSX Intel wxMac Stable</name>
-    <sandbox>td186.testdrive.hp.com</sandbox>
-    <builddir>/tmp/wx/td_mac_stable</builddir>
-    <scheduler>stable_quick</scheduler>
-
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-
-        <setup cppunit-options="--host=i686-apple-darwin8"/>
-        <configure options="--host=i686-apple-darwin8"/>
-
-        <compile/>
-        <compile-samples/>
-        <compile-utils/>
-        <compile-contrib/>
-        <compile-tests/>
-    </steps>
-</build>
-
-<!-- 
-    Windows Quick Builds
--->
-
-<build>
-    <name>MinGW32 wxMSW Trunk</name>
-    <sandbox>td185.testdrive.hp.com</sandbox>
-    <builddir>/tmp/wx/td_msw</builddir>
-    <scheduler>trunk_quick</scheduler>
-
-    <steps>
-        <checkout/>
-
-        <configure options="--host=i386-mingw32 --with-cppunit-prefix=$HOME/opt/mingw345"/>
-
-        <compile/>
-        <compile-samples/>
-        <compile-utils/>
-        <compile-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>MinGW32 wxMSW Stable</name>
-    <sandbox>td189.testdrive.hp.com</sandbox>
-    <builddir>/tmp/wx/td_msw_stable</builddir>
-    <scheduler>stable_quick</scheduler>
-
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-
-        <configure options="--host=i386-mingw32 --with-cppunit-prefix=$HOME/opt/mingw345"/>
-
-        <compile/>
-        <compile-samples/>
-        <compile-utils/>
-        <compile-contrib/>
-        <compile-tests/>
-    </steps>
-</build>
-
-<!-- 
-    Daily builds
--->
-
-<build>
-    <name>FreeBSD x86 wxX11 Stable</name>
-    <sandbox>td152.testdrive.hp.com</sandbox>
-    <builddir>/tmp/wx/td_freebsd_stable</builddir>
-    <scheduler>daily_6am</scheduler>
-
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-
-        <setup/>
-        <configure options="--with-x11"/>
-
-        <compile/>
-        <compile-samples/>
-        <compile-utils/>
-        <compile-contrib/>
-        <compile-tests/>
-
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>HP-UX 11i PA-RISC gcc wxMotif Stable</name>
-    <sandbox>td192.testdrive.hp.com</sandbox>
-    <builddir>/tmp/wx/td_hpux_pa_stable</builddir>
-    <scheduler>daily_6am</scheduler>
-
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-
-        <setup/>
-        <configure/>
-
-        <compile/>
-        <compile-samples/>
-        <compile-utils/>
-        <compile-contrib/>
-        <compile-tests/>
-
-        <run-tests/>
-    </steps>
-</build>
-
-</bot>

build/buildbot/tools/bot.xsd

@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema">
-    <element name="bot">
-        <!-- todo -->
-    </element>
-</schema>

build/buildbot/tools/embedded.xsl

@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       embedded.xsl
-    Purpose:    Embedded XSLT
-    Author:     Mike Wetherell
-    RCS-ID:     $Id$
-    Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWidgets licence
--->
-
-<transform xmlns="http://www.w3.org/1999/XSL/Transform"
-           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-           xmlns:XSL="XSL"
-           version="1.0">
-
-<namespace-alias stylesheet-prefix="XSL" result-prefix="xsl"/>
-
-<output indent="yes"/>
-
-<variable
-    name="top-level-base"
-    select="/*/xsl:import |
-            /*/xsl:include |
-            /*/xsl:attribute-set |
-            /*/xsl:character-map |
-            /*/xsl:decimal-format |
-            /*/xsl:function |
-            /*/xsl:import-schema |
-            /*/xsl:key |
-            /*/xsl:namespace-alias |
-            /*/xsl:output |
-            /*/xsl:param |
-            /*/xsl:preserve-space |
-            /*/xsl:strip-space |
-            /*/xsl:variable"/>
-
-<variable
-    name="top-level"
-    select="$top-level-base |
-            /*/xsl:template"/>
-
-<variable
-    name="top-level-copy"
-    select="$top-level-base |
-            /*/xsl:template
-                [not(following-sibling::xsl:template/@name = @name)]"/>
-
-<template match="/">
-    <XSL:transform>
-        <copy-of select="/*/namespace::*"/>
-
-        <for-each select="/*/@xsl:*">
-            <attribute name="{local-name()}">
-                <value-of select="."/>
-            </attribute>
-        </for-each>
-
-        <apply-templates mode="copy-xsl" select="$top-level-copy"/>
-        <apply-templates select="*"/>
-    </XSL:transform>
-</template>
-
-<template match="*">
-    <variable name="pattern">
-        <call-template name="coord-pattern"/>
-    </variable>
-
-    <XSL:template match="*[generate-id() = generate-id(document('', /){$pattern})]">
-        <copy-of select="namespace::*"/>
-        <choose>
-            <when test="/*/xsl:template[@name = name(current())]">
-                <call-template name="expand"/>
-            </when>
-            <when test="count($top-level | .) != count($top-level)">
-                <call-template name="create-context"/>
-            </when>
-        </choose>
-    </XSL:template>
-
-    <if test="not(self::xsl:*)">
-        <apply-templates select="node()"/>
-    </if>
-</template>
-
-<template match="text()"/>
-
-<template match="@*">
-    <copy/>
-</template>
-
-<template mode="copy-xsl" match="*[/*/xsl:template/@name = name()]">
-    <choose>
-        <when test="ancestor::xsl:template[@name = name(current())]">
-            <XSL:choose>
-                <XSL:when test="name() = '{name()}'">
-                    <XSL:copy>
-                        <call-template name="copy-xsl-children"/>
-                    </XSL:copy>
-                </XSL:when>
-                <XSL:otherwise>
-                    <copy>
-                        <call-template name="copy-xsl-children"/>
-                    </copy>
-                </XSL:otherwise>
-            </XSL:choose>
-        </when>
-        <otherwise>
-            <call-template name="expand"/>
-        </otherwise>
-    </choose>
-</template>
-
-<template mode="copy-xsl" match="@*|node()">
-    <copy>
-        <call-template name="copy-xsl-children"/>
-    </copy>
-</template>
-
-<template name="copy-xsl-children">
-    <copy-of select="namespace::*"/>
-    <apply-templates mode="copy-xsl" select="@*|node()"/>
-</template>
-
-<template name="coord-pattern">
-    <param name="element" select="."/>
-
-    <for-each select="$element/ancestor-or-self::*">
-        <text>/*[</text>
-        <value-of select="count(preceding-sibling::*) + 1"/>
-        <text>]</text>
-    </for-each>
-</template>
-
-<template name="expand">
-    <variable name="params" select="/*/xsl:template[@name = name(current())]/xsl:param"/>
-
-    <XSL:call-template name="{name()}">
-        <if test="$params">
-            <XSL:with-param name="{$params[1]/@name}">
-                <choose>
-                    <when test="ancestor-or-self::xsl:*">
-                        <apply-templates mode="copy-xsl" select="node()"/>
-                    </when>
-                    <otherwise>
-                        <variable name="pattern">
-                            <call-template name="coord-pattern"/>
-                        </variable>
-                        <XSL:apply-templates select="{$pattern}/node()"/>
-                    </otherwise>
-                </choose>
-            </XSL:with-param>
-        </if>
-
-        <for-each select="@*">
-            <XSL:with-param name="{name()}">
-                <call-template name="avt">
-                    <with-param name="string" select="."/>
-                </call-template>
-            </XSL:with-param>
-        </for-each>
-    </XSL:call-template>
-</template>
-
-<template name="create-context">
-    <param name="elements" select="ancestor-or-self::*
-                                   [last() - 1 > position()]
-                                   /preceding-sibling::xsl:variable | ."/>
-
-    <variable name="pattern">
-        <call-template name="coord-pattern">
-            <with-param name="element" select="$elements[1]"/>
-        </call-template>
-    </variable>
-
-    <variable name="parent-pattern">
-        <call-template name="coord-pattern">
-            <with-param name="element" select="$elements[1]/.."/>
-        </call-template>
-    </variable>
-
-    <XSL:for-each select="{$parent-pattern}/*">
-        <XSL:if test="count({$pattern} | .) = 1">
-            <choose>
-                <when test="$elements[1]/self::xsl:*">
-                    <apply-templates mode="copy-xsl" select="$elements[1]"/>
-                    <if test="$elements[2]">
-                        <call-template name="create-context">
-                            <with-param name="elements" select="$elements[position() > 1]"/>
-                        </call-template>
-                    </if>
-                </when>
-                <otherwise>
-                    <copy>
-                        <apply-templates select="@*"/>
-                        <if test="node()">
-                            <XSL:apply-templates select="node()"/>
-                        </if>
-                    </copy>
-                </otherwise>
-            </choose>
-        </XSL:if>
-    </XSL:for-each>
-</template>
-
-<template name="before">
-    <param name="string"/>
-    <param name="target"/>
-
-    <variable name="apos">'</variable>
-    <variable name="quot">"</variable>
-
-    <variable name="posapos" select="string-length(substring-before(
-                                        concat($string, $apos), $apos))"/>
-    <variable name="posquot" select="string-length(substring-before(
-                                        concat($string, $quot), $quot))"/>
-    <variable name="postarg" select="string-length(substring-before(
-                                        concat($string, $target), $target))"/>
-
-    <choose>
-        <when test="$posapos = $postarg and $posquot = $postarg">
-            <value-of select="$string"/>
-        </when>
-        <when test="$posapos > $postarg and $posquot > $postarg">
-            <value-of select="substring($string, 1, $postarg)"/>
-        </when>
-        <otherwise>
-            <variable name="delim">
-                <choose>
-                    <when test="$posquot > $posapos">'</when>
-                    <otherwise>"</otherwise>
-                </choose>
-            </variable>
-
-            <value-of select="substring-before($string, $delim)"/>
-            <value-of select="$delim"/>
-
-            <variable name="mid" select="substring-after($string, $delim)"/>
-
-            <choose>
-                <when test="contains($mid, $delim)">
-                    <value-of select="substring-before($mid, $delim)"/>
-                    <value-of select="$delim"/>
-
-                    <call-template name="before">
-                        <with-param name="string"
-                                    select="substring-after($mid, $delim)"/>
-                        <with-param name="target"
-                                    select="$target"/>
-                    </call-template>
-                </when>
-                <otherwise>
-                    <value-of select="$mid"/>
-                </otherwise>
-            </choose>
-        </otherwise>
-    </choose>
-</template>
-
-<template name="avt">
-    <param name="string"/>
-
-    <variable name="before1" select="substring-before(concat($string, '{'), '{')"/>
-    <variable name="len1" select="string-length($before1)"/>
-
-    <variable name="before2" select="substring-before(concat($string, '}}'), '}}')"/>
-    <variable name="len2" select="string-length($before2)"/>
-
-    <choose>
-        <when test="$before1 = $string and $before2 = $string">
-            <value-of select="$string"/>
-        </when>
-        <when test="$len2 &lt; $len1">
-            <value-of select="$before2"/>
-            <text>}</text>
-            <call-template name="avt">
-                <with-param name="string" select="substring($string, $len2 + 3)"/>
-            </call-template>
-        </when>
-        <when test="substring($string, $len1 + 2, 1) = '{'">
-            <value-of select="$before1"/>
-            <text>{</text>
-            <call-template name="avt">
-                <with-param name="string" select="substring($string, $len1 + 3)"/>
-            </call-template>
-        </when>
-        <otherwise>
-            <variable name="mid" select="substring($string, $len1 + 2)"/>
-            <variable name="expr">
-                <call-template name="before">
-                    <with-param name="string" select="$mid"/>
-                    <with-param name="target">}</with-param>
-                </call-template>
-            </variable>
-            <value-of select="$before1"/>
-            <XSL:copy-of select="{$expr}"/>
-            <call-template name="avt">
-                <with-param name="string" select="substring($mid, string-length($expr) + 2)"/>
-            </call-template>
-        </otherwise>
-    </choose>
-</template>
-
-</transform>

build/buildbot/tools/preprocess.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-#############################################################################
-# Name:        preprocess
-# Purpose:     Expand embedded xslt
-# Author:      Mike Wetherell
-# RCS-ID:      $Id$
-# Copyright:   (c) 2007 Mike Wetherell
-# Licence:     wxWidgets licence
-#############################################################################
-
-if [ $# -eq 0 -o ! -f "$1" ]; then
-    echo "Usage: $0 FILE..."
-    echo "Expands embedded xslt"
-    exit 1
-fi >&2
-
-DIR="`dirname $0`"
-
-while [ $# -gt 0 ]; do
-    xsltproc --xinclude $DIR/embedded.xsl "$1" 2>/dev/null |
-        xsltproc --xinclude - "$1"
-    shift
-done

build/buildbot/tools/validate.sh

@@ -1,65 +0,0 @@
-#!/bin/sh
-#############################################################################
-# Name:        validate
-# Purpose:     Reports errors in wxWidgets buildbot configuration files
-# Author:      Mike Wetherell
-# RCS-ID:      $Id$
-# Copyright:   (c) 2007 Mike Wetherell
-# Licence:     wxWidgets licence
-#############################################################################
-
-if [ $# -eq 0 -o ! -f "$1" ]; then
-    echo "Usage: $0 FILE..."
-    echo "Reports errors in wxWidgets buildbot configuration files"
-    exit 1
-fi >&2
-
-DIR="`dirname $0`"
-WORKDIR="${TMPDIR:-/tmp}/wx.$$"
-mkdir "$WORKDIR" || exit
-trap 'rm -rf "$WORKDIR"' EXIT
-WORKPAT=`echo "$WORKDIR" | sed 's|[^A-Za-z0-9/]|.|g'`
-
-# Change the names of the temporary files in an error message to something
-# to something more informative
-#
-error()
-{
-    if [ -n "$1" ]; then
-        echo "$1" |
-            sed "s|file ${WORKPAT}|${WORKPAT}|g;\
-                 s|${WORKPAT}/XSLT|generated XSLT (from $NAME)|g;\
-                 s|${WORKPAT}/prep|$NAME (preprocessed)|g"
-    fi
-}
-
-# This is pretty ugly, sorry. It tries not to print the same error more than
-# once, and it tries to send success message to stdout and errors to stderr.
-# It still doesn't return a meaningful exit code.
-#
-while [ $# -gt 0 ]
-do
-    INPUT="$1"
-    NAME="`echo \"$INPUT\" | sed 's/[|\]/\\\&/g'`"
-    XSLT="$WORKDIR/XSLT"
-    OUTPUT="$WORKDIR/prep"
-
-    if STDERR=`xsltproc --xinclude -o "$XSLT" $DIR/embedded.xsl "$INPUT" 2>&1`
-    then
-        STDERR=`xsltproc --xinclude -o "$OUTPUT" "$XSLT" "$INPUT" 2>&1` \
-            && OK=true || OK=false
-        error "$STDERR" >&2
-
-        if $OK; then
-            STDERR=`xmllint --noout --schema $DIR/bot.xsd "$OUTPUT" 2>&1` \
-                && OUT=1 || OUT=2
-            error "$STDERR" >&$OUT
-        fi
-    else
-        error "$STDERR" >&2
-    fi
-
-    rm -f "$XSLT" "$OUTPUT"
-
-    shift
-done

build/msw/.cvsignore

@@ -0,0 +1,5 @@
+.m*
+config.dmc
+makefile.dmc
+vc_mswhdll
+vc_mswuhdll

build/msw/config.bcc

@@ -1,6 +1,6 @@
 # =========================================================================
 #     This configuration file was generated by
-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Beware that all changes made to this file will be overwritten next
 #     time you run Bakefile!
 # =========================================================================
@@ -57,7 +57,7 @@ WXUNIV = 0
 
 # Compile Unicode build of wxWidgets? [0,1]
 !ifndef UNICODE
-UNICODE = 1
+UNICODE = 0
 !endif
 
 # Use MSLU library when building Unicode version. [0,1]
@@ -118,11 +118,6 @@ USE_AUI = 1
 USE_RICHTEXT = 1
 !endif
 
-# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
-!ifndef USE_STC
-USE_STC = 1
-!endif
-
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 !ifndef USE_OPENGL
 USE_OPENGL = 0

build/msw/config.gcc

@@ -1,6 +1,6 @@
 # =========================================================================
 #     This configuration file was generated by
-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Beware that all changes made to this file will be overwritten next
 #     time you run Bakefile!
 # =========================================================================
@@ -11,127 +11,124 @@
 # -------------------------------------------------------------------------
 
 # C compiler 
-CC := gcc
+CC = gcc
 
 # C++ compiler 
-CXX := g++
+CXX = g++
 
 # Standard flags for CC 
-CFLAGS := 
+CFLAGS = 
 
 # Standard flags for C++ 
-CXXFLAGS := 
+CXXFLAGS = 
 
 # Standard preprocessor flags (common for CC and CXX) 
-CPPFLAGS := 
+CPPFLAGS = 
 
 # Standard linker flags 
-LDFLAGS := 
+LDFLAGS = 
 
 # The C preprocessor 
-CPP := $(CC) -E
+CPP = $(CC) -E
 
 # What type of library to build? [0,1]
-SHARED := 0
+SHARED = 0
 
 # Build wxUniversal instead of native port? [0,1]
-WXUNIV := 0
+WXUNIV = 0
 
 # Compile Unicode build of wxWidgets? [0,1]
-UNICODE := 1
+UNICODE = 0
 
 # Use MSLU library when building Unicode version. [0,1]
-MSLU := 0
+MSLU = 0
 
 # Type of compiled binaries [debug,release]
-BUILD := debug
+BUILD = debug
 
 # Should debugging info be included in the executables? The default value
 # "default" means that debug info will be included if BUILD=debug
 # and not included if BUILD=release. [0,1,default]
-DEBUG_INFO := default
+DEBUG_INFO = default
 
 # Should __WXDEBUG__ be defined? The default value "default" means that it will
 # be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
-DEBUG_FLAG := default
+DEBUG_FLAG = default
 
 # Multiple libraries or single huge monolithic one? [0,1]
-MONOLITHIC := 0
+MONOLITHIC = 0
 
 # Build GUI libraries? [0,1]
-USE_GUI := 1
+USE_GUI = 1
 
 # Build wxHTML library (USE_GUI must be 1)? [0,1]
-USE_HTML := 1
+USE_HTML = 1
 
 # Build multimedia library (USE_GUI must be 1)? [0,1]
-USE_MEDIA := 1
+USE_MEDIA = 1
 
 # Build wxXRC library (USE_GUI must be 1)? [0,1]
-USE_XRC := 1
+USE_XRC = 1
 
 # Build wxAUI library (USE_GUI must be 1)? [0,1]
-USE_AUI := 1
+USE_AUI = 1
 
 # Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
-USE_RICHTEXT := 1
-
-# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
-USE_STC := 1
+USE_RICHTEXT = 1
 
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
-USE_OPENGL := 0
+USE_OPENGL = 0
 
 # Build ODBC database classes (USE_GUI must be 1)? [0,1]
-USE_ODBC := 0
+USE_ODBC = 0
 
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
-USE_QA := 0
+USE_QA = 0
 
 # Enable exceptions in compiled code. [0,1]
-USE_EXCEPTIONS := 1
+USE_EXCEPTIONS = 1
 
 # Enable run-time type information (RTTI) in compiled code. [0,1]
-USE_RTTI := 1
+USE_RTTI = 1
 
 # Enable threading in compiled code. [0,1]
-USE_THREADS := 1
+USE_THREADS = 1
 
 # Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
-USE_GDIPLUS := 0
+USE_GDIPLUS = 0
 
 # Is this official build by wxWidgets developers? [0,1]
-OFFICIAL_BUILD := 0
+OFFICIAL_BUILD = 0
 
 # Use this to name your customized DLLs differently 
-VENDOR := custom
+VENDOR = custom
 
 #  
-WX_FLAVOUR := 
+WX_FLAVOUR = 
 
 #  
-WX_LIB_FLAVOUR := 
+WX_LIB_FLAVOUR = 
 
 # Name of your custom configuration. This affects directory
 # where object files are stored as well as the location of
 # compiled .lib files and setup.h under the lib/ toplevel directory. 
-CFG := 
+CFG = 
 
 # Compiler flags needed to compile test suite in tests directory. If you want
 # to run the tests, set it so that the compiler can find CppUnit headers. 
-CPPUNIT_CFLAGS := 
+CPPUNIT_CFLAGS = 
 
 # Linker flags needed to link test suite in tests directory. If you want
 # to run the tests, include CppUnit library here. 
-CPPUNIT_LIBS := 
+CPPUNIT_LIBS = 
 
 # Version of C runtime library to use. You can change this to
 # static if SHARED=0, but it is highly recommended to not do
 # it if SHARED=1 unless you know what you are doing. [dynamic,static]
-RUNTIME_LIBS := dynamic
+RUNTIME_LIBS = dynamic
 
 # Set the version of your Mingw installation here.
 #     "3" ...... this is for Mingw 2.0 or newer (comes with gcc3)
 #     "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95]
-GCC_VERSION := 3
+GCC_VERSION = 3
 

build/msw/config.vc

@@ -1,6 +1,6 @@
 # =========================================================================
 #     This configuration file was generated by
-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Beware that all changes made to this file will be overwritten next
 #     time you run Bakefile!
 # =========================================================================
@@ -38,7 +38,7 @@ SHARED = 0
 WXUNIV = 0
 
 # Compile Unicode build of wxWidgets? [0,1]
-UNICODE = 1
+UNICODE = 0
 
 # Use MSLU library when building Unicode version. [0,1]
 MSLU = 0
@@ -89,9 +89,6 @@ USE_AUI = 1
 # Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
 USE_RICHTEXT = 1
 
-# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
-USE_STC = 1
-
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 

build/msw/config.wat

@@ -1,6 +1,6 @@
 # =========================================================================
 #     This configuration file was generated by
-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Beware that all changes made to this file will be overwritten next
 #     time you run Bakefile!
 # =========================================================================
@@ -41,7 +41,7 @@ WXUNIV = 0
 
 # Compile Unicode build of wxWidgets? [0,1]
 #   1 - Unicode
-UNICODE = 1
+UNICODE = 0
 
 # Type of compiled binaries [debug,release]
 BUILD = debug
@@ -80,9 +80,6 @@ USE_AUI = 1
 # Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
 USE_RICHTEXT = 1
 
-# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
-USE_STC = 1
-
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 

build/msw/wx.dsw

@@ -1,271 +1,244 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-Project: "wxregex"=wx_wxregex.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxzlib"=wx_wxzlib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxpng"=wx_wxpng.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxjpeg"=wx_wxjpeg.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxtiff"=wx_wxtiff.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxexpat"=wx_wxexpat.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxscintilla"=wx_wxscintilla.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "base"=wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "net"=wx_net.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "core"=wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "adv"=wx_adv.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "media"=wx_media.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "odbc"=wx_odbc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "dbgrid"=wx_dbgrid.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "html"=wx_html.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "qa"=wx_qa.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "xml"=wx_xml.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "xrc"=wx_xrc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "aui"=wx_aui.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "richtext"=wx_richtext.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "stc"=wx_stc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name wxscintilla
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gl"=wx_gl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+Project: "wxregex"=wx_wxregex.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxzlib"=wx_wxzlib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxpng"=wx_wxpng.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxjpeg"=wx_wxjpeg.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxtiff"=wx_wxtiff.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxexpat"=wx_wxexpat.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "base"=wx_base.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "net"=wx_net.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "core"=wx_core.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "adv"=wx_adv.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "media"=wx_media.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "odbc"=wx_odbc.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "dbgrid"=wx_dbgrid.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "html"=wx_html.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "qa"=wx_qa.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "xml"=wx_xml.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "xrc"=wx_xrc.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "aui"=wx_aui.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "richtext"=wx_richtext.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "gl"=wx_gl.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+

build/msw/wx_dll.dsw

@@ -1,479 +1,479 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "adv"=.\wx_adv.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxtiff
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxjpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxpng
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name core
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "aui"=.\wx_aui.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxtiff
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxjpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxpng
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name adv
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=.\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxzlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "core"=.\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxtiff
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxjpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxpng
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dbgrid"=.\wx_dbgrid.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name odbc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxtiff
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxjpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxpng
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name adv
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gl"=.\wx_gl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxtiff
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxjpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxpng
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name core
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "html"=.\wx_html.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxtiff
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxjpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxpng
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name core
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "media"=.\wx_media.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxtiff
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxjpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxpng
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name core
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "net"=.\wx_net.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxzlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "odbc"=.\wx_odbc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxzlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "qa"=.\wx_qa.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxtiff
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxjpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxpng
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name core
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name xml
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "richtext"=.\wx_richtext.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxtiff
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxjpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxpng
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name adv
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name html
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name xml
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "wxexpat"=.\wx_wxexpat.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxjpeg"=.\wx_wxjpeg.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxpng"=.\wx_wxpng.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxzlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "wxregex"=.\wx_wxregex.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxtiff"=.\wx_wxtiff.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxzlib"=.\wx_wxzlib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "xml"=.\wx_xml.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxzlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xrc"=.\wx_xrc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name xml
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name html
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name adv
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "adv"=.\wx_adv.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name wxtiff
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxjpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxregex
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxexpat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name core
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "aui"=.\wx_aui.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name wxtiff
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxjpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxregex
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxexpat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name adv
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "base"=.\wx_base.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name wxzlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxregex
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxexpat
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "core"=.\wx_core.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name wxtiff
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxjpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name base
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "dbgrid"=.\wx_dbgrid.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name odbc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxtiff
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxjpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name adv
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "gl"=.\wx_gl.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name wxtiff
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxjpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxregex
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxexpat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name core
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "html"=.\wx_html.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name wxtiff
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxjpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxregex
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxexpat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name core
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "media"=.\wx_media.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name wxtiff
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxjpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxregex
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxexpat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name core
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "net"=.\wx_net.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name wxzlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxregex
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxexpat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name base
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "odbc"=.\wx_odbc.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name wxzlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxregex
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxexpat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name base
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "qa"=.\wx_qa.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name wxtiff
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxjpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxexpat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxregex
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name core
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name base
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name xml
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "richtext"=.\wx_richtext.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name wxtiff
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxjpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxregex
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxexpat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name adv
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name html
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name xml
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "wxexpat"=.\wx_wxexpat.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxjpeg"=.\wx_wxjpeg.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxpng"=.\wx_wxpng.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name wxzlib
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "wxregex"=.\wx_wxregex.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxtiff"=.\wx_wxtiff.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxzlib"=.\wx_wxzlib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "xml"=.\wx_xml.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name wxzlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxregex
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxexpat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name base
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "xrc"=.\wx_xrc.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name xml
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name html
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name adv
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

build/msw/wx_stc.dsp

@@ -1,998 +0,0 @@
-# Microsoft Developer Studio Project File - Name="wx_stc" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=stc - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "wx_stc.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "wx_stc.mak" CFG="stc - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "stc - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stc - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stc - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stc - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stc - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stc - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stc - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stc - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stc - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "stc - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "stc - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "stc - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "stc - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "stc - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "stc - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "stc - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "stc - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_stcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290u_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_stcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290u_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_stc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_stcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_stcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_stcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_stcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_stc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_stcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290d_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_stcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290d_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290d_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290d_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_stc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_stc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_stcdll.pch" /Fd..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_stcdll.pch" /Fd..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_stc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_stcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_stcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_stc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_stc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_stcdll.pch" /Fd..\..\lib\vc_dll\wxmsw290_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_stcdll.pch" /Fd..\..\lib\vc_dll\wxmsw290_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_stc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_stcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_stcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290d_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290d_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_stc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_stc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29u_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29u_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29u_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29u_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29ud_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29ud_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29ud_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29ud_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29u_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29u_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29ud_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29ud_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\stc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\stc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29d_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29d_stc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_stclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29d_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29d_stc.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "stc - Win32 DLL Universal Unicode Release"
-# Name "stc - Win32 DLL Universal Unicode Debug"
-# Name "stc - Win32 DLL Universal Release"
-# Name "stc - Win32 DLL Universal Debug"
-# Name "stc - Win32 DLL Unicode Release"
-# Name "stc - Win32 DLL Unicode Debug"
-# Name "stc - Win32 DLL Release"
-# Name "stc - Win32 DLL Debug"
-# Name "stc - Win32 Universal Unicode Release"
-# Name "stc - Win32 Universal Unicode Debug"
-# Name "stc - Win32 Universal Release"
-# Name "stc - Win32 Universal Debug"
-# Name "stc - Win32 Unicode Release"
-# Name "stc - Win32 Unicode Debug"
-# Name "stc - Win32 Release"
-# Name "stc - Win32 Debug"
-# Begin Group "Common Sources"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\common\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# End Group
-# Begin Group "MSW Sources"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\msw\version.rc
-
-!IF  "$(CFG)" == "stc - Win32 DLL Universal Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Release"
-
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "Setup Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\wx\univ\setup.h
-
-!IF  "$(CFG)" == "stc - Win32 DLL Universal Unicode Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Unicode Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Unicode Release"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Unicode Debug"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Release"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Debug"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Unicode Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Unicode Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Unicode Release"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Unicode Debug"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Release"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Debug"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\setup.h
-
-!IF  "$(CFG)" == "stc - Win32 DLL Universal Unicode Release"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Unicode Debug"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Release"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Debug"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Unicode Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Unicode Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Unicode Release"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Unicode Debug"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Release"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Debug"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Unicode Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Unicode Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "MSW Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\genrcdefs.h
-
-!IF  "$(CFG)" == "stc - Win32 DLL Universal Unicode Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Unicode Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Unicode Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Unicode Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Unicode Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Unicode Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Universal Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Unicode Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Unicode Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "stc - Win32 Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "Common Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\wx\stc\stc.h
-# End Source File
-# End Group
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\stc\PlatWX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\ScintillaWX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\stc.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-

build/msw/wx_wxexpat.dsp

@@ -1,451 +1,451 @@
-# Microsoft Developer Studio Project File - Name="wx_wxexpat" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=wxexpat - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "wx_wxexpat.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "wx_wxexpat.mak" CFG="wxexpat - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wxexpat - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "wxexpat - Win32 DLL Universal Unicode Release"
-# Name "wxexpat - Win32 DLL Universal Unicode Debug"
-# Name "wxexpat - Win32 DLL Universal Release"
-# Name "wxexpat - Win32 DLL Universal Debug"
-# Name "wxexpat - Win32 DLL Unicode Release"
-# Name "wxexpat - Win32 DLL Unicode Debug"
-# Name "wxexpat - Win32 DLL Release"
-# Name "wxexpat - Win32 DLL Debug"
-# Name "wxexpat - Win32 Universal Unicode Release"
-# Name "wxexpat - Win32 Universal Unicode Debug"
-# Name "wxexpat - Win32 Universal Release"
-# Name "wxexpat - Win32 Universal Debug"
-# Name "wxexpat - Win32 Unicode Release"
-# Name "wxexpat - Win32 Unicode Debug"
-# Name "wxexpat - Win32 Release"
-# Name "wxexpat - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\expat\lib\xmlparse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\expat\lib\xmlrole.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\expat\lib\xmltok.c
-# End Source File
-# End Group
-# End Target
-# End Project
-
+# Microsoft Developer Studio Project File - Name="wx_wxexpat" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=wxexpat - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "wx_wxexpat.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "wx_wxexpat.mak" CFG="wxexpat - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "wxexpat - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Universal Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Universal Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "wxexpat - Win32 DLL Universal Unicode Release"
+# Name "wxexpat - Win32 DLL Universal Unicode Debug"
+# Name "wxexpat - Win32 DLL Universal Release"
+# Name "wxexpat - Win32 DLL Universal Debug"
+# Name "wxexpat - Win32 DLL Unicode Release"
+# Name "wxexpat - Win32 DLL Unicode Debug"
+# Name "wxexpat - Win32 DLL Release"
+# Name "wxexpat - Win32 DLL Debug"
+# Name "wxexpat - Win32 Universal Unicode Release"
+# Name "wxexpat - Win32 Universal Unicode Debug"
+# Name "wxexpat - Win32 Universal Release"
+# Name "wxexpat - Win32 Universal Debug"
+# Name "wxexpat - Win32 Unicode Release"
+# Name "wxexpat - Win32 Unicode Debug"
+# Name "wxexpat - Win32 Release"
+# Name "wxexpat - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\src\expat\lib\xmlparse.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\expat\lib\xmlrole.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\expat\lib\xmltok.c
+# End Source File
+# End Group
+# End Target
+# End Project
+

build/msw/wx_wxscintilla.dsp

@@ -1,763 +0,0 @@
-# Microsoft Developer Studio Project File - Name="wx_wxscintilla" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=wxscintilla - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "wx_wxscintilla.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "wx_wxscintilla.mak" CFG="wxscintilla - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wxscintilla - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxscintilla - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintilla.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxscintillad.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintilla.lib"
-
-!ELSEIF  "$(CFG)" == "wxscintilla - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\wxscintilla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\wxscintilla"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxscintillad.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "wxscintilla - Win32 DLL Universal Unicode Release"
-# Name "wxscintilla - Win32 DLL Universal Unicode Debug"
-# Name "wxscintilla - Win32 DLL Universal Release"
-# Name "wxscintilla - Win32 DLL Universal Debug"
-# Name "wxscintilla - Win32 DLL Unicode Release"
-# Name "wxscintilla - Win32 DLL Unicode Debug"
-# Name "wxscintilla - Win32 DLL Release"
-# Name "wxscintilla - Win32 DLL Debug"
-# Name "wxscintilla - Win32 Universal Unicode Release"
-# Name "wxscintilla - Win32 Universal Unicode Debug"
-# Name "wxscintilla - Win32 Universal Release"
-# Name "wxscintilla - Win32 Universal Debug"
-# Name "wxscintilla - Win32 Unicode Release"
-# Name "wxscintilla - Win32 Unicode Debug"
-# Name "wxscintilla - Win32 Release"
-# Name "wxscintilla - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\AutoComplete.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\CallTip.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\CellBuffer.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\CharClassify.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\ContractionState.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\Document.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\DocumentAccessor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\Editor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\ExternalLexer.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\Indicator.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\KeyMap.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\KeyWords.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexAPDL.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexAU3.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexAVE.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexAda.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexAsm.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexAsn1.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexBaan.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexBash.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexBasic.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexBullant.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexCLW.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexCPP.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexCSS.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexCaml.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexConf.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexCrontab.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexCsound.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexEScript.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexEiffel.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexErlang.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexFlagship.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexForth.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexFortran.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexGui4Cli.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexHTML.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexHaskell.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexInno.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexKix.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexLisp.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexLout.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexLua.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexMMIXAL.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexMPT.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexMSSQL.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexMatlab.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexMetapost.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexNsis.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexOpal.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexOthers.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexPB.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexPOV.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexPS.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexPascal.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexPerl.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexPython.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexRebol.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexRuby.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexSQL.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexScriptol.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexSmalltalk.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexSpecman.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexSpice.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexTADS3.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexTCL.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexTeX.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexVB.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexVHDL.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexVerilog.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LexYAML.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\LineMarker.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\PropSet.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\RESearch.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\ScintillaBase.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\Style.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\StyleContext.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\UniConversion.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\ViewStyle.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\WindowAccessor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stc\scintilla\src\XPM.cxx
-# End Source File
-# End Group
-# End Target
-# End Project
-

build/msw/wx_wxzlib.dsp

@@ -1,487 +1,487 @@
-# Microsoft Developer Studio Project File - Name="wx_wxzlib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=wxzlib - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "wx_wxzlib.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "wx_wxzlib.mak" CFG="wxzlib - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wxzlib - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "wxzlib - Win32 DLL Universal Unicode Release"
-# Name "wxzlib - Win32 DLL Universal Unicode Debug"
-# Name "wxzlib - Win32 DLL Universal Release"
-# Name "wxzlib - Win32 DLL Universal Debug"
-# Name "wxzlib - Win32 DLL Unicode Release"
-# Name "wxzlib - Win32 DLL Unicode Debug"
-# Name "wxzlib - Win32 DLL Release"
-# Name "wxzlib - Win32 DLL Debug"
-# Name "wxzlib - Win32 Universal Unicode Release"
-# Name "wxzlib - Win32 Universal Unicode Debug"
-# Name "wxzlib - Win32 Universal Release"
-# Name "wxzlib - Win32 Universal Debug"
-# Name "wxzlib - Win32 Unicode Release"
-# Name "wxzlib - Win32 Unicode Debug"
-# Name "wxzlib - Win32 Release"
-# Name "wxzlib - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\zlib\adler32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\compress.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\crc32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\deflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\gzio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\infback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\inffast.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\inflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\inftrees.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\trees.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\uncompr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zutil.c
-# End Source File
-# End Group
-# End Target
-# End Project
-
+# Microsoft Developer Studio Project File - Name="wx_wxzlib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=wxzlib - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "wx_wxzlib.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "wx_wxzlib.mak" CFG="wxzlib - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "wxzlib - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Universal Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Universal Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "wxzlib - Win32 DLL Universal Unicode Release"
+# Name "wxzlib - Win32 DLL Universal Unicode Debug"
+# Name "wxzlib - Win32 DLL Universal Release"
+# Name "wxzlib - Win32 DLL Universal Debug"
+# Name "wxzlib - Win32 DLL Unicode Release"
+# Name "wxzlib - Win32 DLL Unicode Debug"
+# Name "wxzlib - Win32 DLL Release"
+# Name "wxzlib - Win32 DLL Debug"
+# Name "wxzlib - Win32 Universal Unicode Release"
+# Name "wxzlib - Win32 Universal Unicode Debug"
+# Name "wxzlib - Win32 Universal Release"
+# Name "wxzlib - Win32 Universal Debug"
+# Name "wxzlib - Win32 Unicode Release"
+# Name "wxzlib - Win32 Unicode Debug"
+# Name "wxzlib - Win32 Release"
+# Name "wxzlib - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\src\zlib\adler32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\zlib\compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\zlib\crc32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\zlib\deflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\zlib\gzio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\zlib\infback.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\zlib\inffast.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\zlib\inflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\zlib\inftrees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\zlib\trees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\zlib\uncompr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\zlib\zutil.c
+# End Source File
+# End Group
+# End Target
+# End Project
+

build/os2/config.wat

@@ -1,6 +1,6 @@
 # =========================================================================
 #     This configuration file was generated by
-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Beware that all changes made to this file will be overwritten next
 #     time you run Bakefile!
 # =========================================================================
@@ -41,7 +41,7 @@ WXUNIV = 0
 
 # Compile Unicode build of wxWidgets? [0,1]
 #   1 - Unicode
-UNICODE = 1
+UNICODE = 0
 
 # Type of compiled binaries [debug,release]
 BUILD = debug
@@ -80,9 +80,6 @@ USE_AUI = 1
 # Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
 USE_RICHTEXT = 1
 
-# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
-USE_STC = 1
-
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 

build/palmos/.cvsignore

@@ -0,0 +1 @@
+DebugSim

build/script/makedocs.vc

@@ -11,21 +11,85 @@ DOCDIR = $(WXDIR)\docs
 WAITFLAG=/w
 
 # Making documents
-docs:   wxhlp rtf pdfrtf wxhtml htmlhelp htb tex2rtf
+docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp htmlhelp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
-rtf:    $(DOCDIR)/latex/wx/wx.rtf
+rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 html:	wxhtml
 htb:	$(DOCDIR)\htb\wx.htb
 wxhtml:	$(DOCDIR)\html\wx\wx_contents.html
 htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
+#ps:     wxps
+#wxps:	$(WXDIR)\docs\ps\wx.ps
 
-tex2rtf:
-	cd $(WXWIN)\utils\tex2rtf\docs
-	nmake -f makefile.vc
-	cd $(THISDIR)
+allhlp: wxhlp
+#        cd $(WXDIR)\utils\dialoged\src
+#        nmake -f makefile.vc hlp
+        cd $(WXDIR)\utils\tex2rtf\docs
+        nmake -f makefile.vc hlp
+        cd $(WXDIR)\contrib\src\fl
+        -nmake -f makedocs.vc hlp
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\ogl
+        -nmake -f makedocs.vc hlp
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\svg
+        -nmake -f makedocs.vc hlp
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\gizmos
+        -nmake -f makedocs.vc hlp
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\mmedia
+        -nmake -f makedocs.vc hlp
+        cd $(THISDIR)
+
+
+allpdfrtf: pdfrtf
+
+allhtb: htb
+
+allhtml: wxhtml
+#        cd $(WXDIR)\utils\dialoged\src
+#        nmake -f makefile.vc html
+        cd $(WXDIR)\utils\tex2rtf\docs
+        nmake -f makefile.vc html
+        cd $(WXDIR)\contrib\src\fl
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\ogl
+        nmake -f makedocs.vc html
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\svg
+        nmake -f makedocs.vc html
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\gizmos
+        nmake -f makedocs.vc html
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\mmedia
+        nmake -f makedocs.vc html
+        cd $(THISDIR)
+
+allhtmlhelp: htmlhelp
+#       cd $(WXDIR)\utils\dialoged\src
+#        nmake -f makefile.vc htmlhelp
+        cd $(WXDIR)\utils\tex2rtf\docs
+        -nmake -f makefile.vc htmlhelp
+        cd $(WXDIR)\contrib\src\fl
+        -nmake -f makedocs.vc htmlhelp
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\ogl
+        -nmake -f makedocs.vc htmlhelp
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\svg
+        -nmake -f makedocs.vc htmlhelp
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\gizmos
+        -nmake -f makedocs.vc htmlhelp
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\mmedia
+        -nmake -f makedocs.vc htmlhelp
+        cd $(THISDIR)
 
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
@@ -78,7 +142,37 @@ $(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx_contents.html $(DOCDIR)\mshtml\
     	move wx.chm ..\..\htmlhelp
 	cd $(THISDIR)
 
+#$(WXDIR)\docs\latex\wx\manual.dvi:	$(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
+#	cd $(WXDIR)\docs\latex\wx
+#        -latex manual
+#        -latex manual
+#        -makeindx manual
+#        -bibtex manual
+#        -latex manual
+#        -latex manual
+#        cd $(THISDIR)
 
+#$(WXDIR)\docs\ps\wx.ps:	$(WXDIR)\docs\latex\wx\manual.dvi
+#	cd $(WXDIR)\docs\latex\wx
+#        -dvips32 -o wx.ps manual
+#        move wx.ps $(WXDIR)\docs\ps\wx.ps
+#        cd $(THISDIR)
+
+#$(WXDIR)\docs\latex\wx\referenc.dvi:	$(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
+#	cd $(WXDIR)\docs\latex\wx
+#        -latex referenc
+#        -latex referenc
+#        -makeindx referenc
+#        -bibtex referenc
+#        -latex referenc
+#        -latex referenc
+#        cd $(THISDIR)
+
+#$(WXDIR)\docs\ps\referenc.ps:	$(WXDIR)\docs\latex\wx\referenc.dvi
+#	cd $(WXDIR)\docs\latex\wx
+#        -dvips32 -o referenc.ps referenc
+#        move referenc.ps $(WXDIR)\docs\ps\referenc.ps
+#        cd $(THISDIR)
 
 # An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
 # files, renamed to htb.
@@ -125,4 +219,87 @@ cleanonlinehelp:
     -erase $(DOCDIR)\htb\wx.htb
 
 
+# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
+# Office StartUp folder, and PDFMaker should be installed.
+#updatepdf:  # touchmanual pdfrtf
+#    start $(WAITFLAG) "\progra~1\micros~3\office\winword.exe c:\wx\wxWidgets\docs\pdf\wx.rtf /mGeneratePDF"
+
+
+
+######################
+# Tex2RTF
+######################
+
+TEX2RTFDOCDIR=$(WXDIR)\utils\tex2rtf\docs
+
+tex2rtfhtml: $(DOCDIR)\html\tex2rtf\t2rtf.htm
+tex2rtfhtmlhelp: $(DOCDIR)\htmlhelp\tex2rtf.chm
+tex2rtfhtb:	$(DOCDIR)\htb\tex2rtf.htb
+tex2rtfhlp: $(DOCDIR)\winhelp\tex2rtf.hlp
+tex2rtfpdfrtf: $(DOCDIR)\pdf\tex2rtf.rtf
+tex2rtfps: $(WXDIR)\docs\ps\tex2rtf.ps
+
+$(DOCDIR)\winhelp\tex2rtf.hlp:         $(TEX2RTFDOCDIR)\tex2rtf.rtf $(TEX2RTFDOCDIR)\tex2rtf.hpj
+        cd $(TEX2RTFDOCDIR)
+        -erase tex2rtf.ph
+        hcw /c /e tex2rtf
+        copy tex2rtf.hlp $(DOCDIR)\winhelp\tex2rtf.hlp
+        copy tex2rtf.cnt $(DOCDIR)\winhelp\tex2rtf.cnt
+        cd $(THISDIR)
+
+$(TEX2RTFDOCDIR)\tex2rtf.rtf: $(DOCSOURCES)
+        cd $(TEX2RTFDOCDIR)
+        -start /w tex2rtf $(TEX2RTFDOCDIR)\tex2rtf.tex $(TEX2RTFDOCDIR)\tex2rtf.rtf -twice -winhelp
+        cd $(THISDIR)
+
+$(DOCDIR)\pdf\tex2rtf.rtf: $(DOCSOURCES)
+        cd $(TEX2RTFDOCDIR)
+        -copy *.wmf $(DOCDIR)\pdf
+        -copy *.bmp $(DOCDIR)\pdf
+        -start /w tex2rtf $(TEX2RTFDOCDIR)\tex2rtf.tex $(DOCDIR)\pdf\tex2rtf.rtf -twice -rtf
+        cd $(THISDIR)
+
+$(DOCDIR)\html\tex2rtf\t2rtf.htm:         $(DOCSOURCES)
+        cd $(TEX2RTFDOCDIR)
+        -mkdir $(DOCDIR)\html\tex2rtf
+        -copy *.gif $(DOCDIR)\html\tex2rtf
+        -start /w tex2rtf $(TEX2RTFDOCDIR)\tex2rtf.tex $(DOCDIR)\html\tex2rtf\t2rtf.htm -twice -html
+        -erase $(DOCDIR)\html\tex2rtf\*.con
+        -erase $(DOCDIR)\html\tex2rtf\*.ref
+        cd $(THISDIR)
+
+$(DOCDIR)\htmlhelp\tex2rtf.chm : $(DOCDIR)\html\tex2rtf\t2rtf.htm $(DOCDIR)\html\tex2rtf\t2rtf.hhp
+	cd $(DOCDIR)\html\tex2rtf
+	-hhc t2rtf.hhp
+    	move t2rtf.chm $(DOCDIR)\htmlhelp\tex2rtf.chm
+	cd $(THISDIR)
+
+# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
+# files, renamed to htb.
+# This can then be used with e.g. helpview.
+# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
+$(DOCDIR)\htb\tex2rtf.htb: $(DOCDIR)\html\tex2rtf\t2rtf.htm
+	cd $(DOCDIR)\html\tex2rtf
+    -erase tex2rtf.zip tex2rtf.htb
+    zip tex2rtf.zip *.htm *.gif *.hhp *.hhc *.hhk
+    -mkdir $(DOCDIR)\htb
+    move tex2rtf.zip $(DOCDIR)\htb\tex2rtf.htb
+    cd $(THISDIR)
+
+#$(TEX2RTFDOCDIR)\tex2rtf.dvi:	$(DOCSOURCES)
+#	cd $(TEX2RTFDOCDIR)
+#        -latex tex2rtf
+#        -latex tex2rtf
+#        -makeindx tex2rtf
+#        -bibtex tex2rtf
+#        -latex tex2rtf
+#        -latex tex2rtf
+#        cd $(THISDIR)
+
+#$(WXDIR)\docs\ps\tex2rtf.ps:	$(TEX2RTFDOCDIR)\tex2rtf.dvi
+#	cd $(TEX2RTFDOCDIR)
+#        -dvips32 -o tex2rtf.ps tex2rtf
+#        copy tex2rtf.ps $(WXDIR)\docs\ps\tex2rtf.ps
+#        cd $(THISDIR)
+#
 

build/script/rebuild-makefiles.sh

@@ -2,24 +2,23 @@
 
 CURDATE=`date -I`
 WORKDIR=/home/bake/bkl-cronjob
-WINSRCDIR=/mnt/daily
 FTPDIR=/home/ftp/pub
 LD_LIBRARY_PATH=/usr/local/lib
 
-update_from_svn()
+update_from_cvs()
 {
     (
-    cd ${WORKDIR}/wxWidgets 
-    svn up
-    find . -name \.#\* | xargs rm -rf
+    cd ${WORKDIR}/wxWidgets &&  cvs -z3 update -P -d
+    )
+    (
+    cd ${WORKDIR}/wxGTK &&  cvs -z3 update -P 
     )
-
 }
 
 
 regenerate_makefiles()
 {
-    (cd ${WORKDIR}/wxWidgets/build/bakefiles && nice python -O /usr/local/bin/bakefile_gen)
+    (cd ${WORKDIR}/wxWidgets/build/bakefiles && nice python -O ${WORKDIR}/bakefile/bin/bakefile_gen)
 }
 
 
@@ -47,80 +46,76 @@ do_package()
     cd ..
 }
 
-
+package_cvs()
+{
+    rm -f ${WORKDIR}/archives/wx-cvs-$1*
+    cd ${WORKDIR}/
+    ##tar --exclude=*.ds* -jcf ./archives/test.tar.bz2 ./wxGTK
+    tar --exclude=*.ds* -jcf ./archives/wx-cvs-$1-${CURDATE}.tar.bz2 ./$2
+}
 
 
 package_makefiles()
 {
     do_package tar autoconf  Makefile.in autoconf_inc.m4
-    do_package zip gnu       makefile.unx 
-    do_package tar gnu       makefile.unx 
+    do_package zip borland   makefile.bcc config.bcc
     do_package zip mingw     makefile.gcc config.gcc
     do_package zip dmars     makefile.dmc config.dmc makefile.dms config.dms
-    do_package zip watcom_msw    makefile.wat config.wat
+    do_package zip watcom    makefile.wat config.wat
     do_package zip msvc      makefile.vc config.vc
     do_package zip msvc6prj  '*.dsp' '*.dsw'
     do_package zip evcprj    '*.vcp' '*.vcw'
-  (cd ${WORKDIR}/wxWidgets/build/bakefiles && nice python -O /usr/local/bin/bakefile_gen -f watcom -d ../os2/Bakefiles.os2.bkgen)
-  do_package zip watcom_os2    makefile.wat config.wat
 }
 
 copy_files ()
 {
 ##delete old files and then copy new ones, add a symlink
+## CVS
+find ${FTPDIR}/CVS_HEAD/files -type f -name wx-cvs\* -mtime +6 | xargs rm -rf
+cp  ${WORKDIR}/archives/wx-cvs-* ${FTPDIR}/CVS_HEAD/files
+
+rm ${FTPDIR}/CVS_HEAD/wx* ${FTPDIR}/CVS_HEAD/MD5SUM
+for f in `find ${FTPDIR}/CVS_HEAD/files -type f -name wx-cvs\* -mmin -601` ; do
+       ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `
+done
+md5sum ${FTPDIR}/CVS_HEAD/wx* > ${FTPDIR}/CVS_HEAD/MD5SUM
+## make sure updated at is really last
+sleep 10
+echo cvs checkout done at  `date -u` > ${FTPDIR}/CVS_HEAD/updated_at.txt
 
 ## Makefiles
-find ${FTPDIR}/Daily_Makefiles/files -type f -name wx-mk\* -mtime +3 | xargs rm -rf
-cp  ${WORKDIR}/archives/wx-mk-* ${FTPDIR}/Daily_Makefiles/files
+find ${FTPDIR}/CVS_Makefiles/files -type f -name wx-mk\* -mtime +3 | xargs rm -rf
+cp  ${WORKDIR}/archives/wx-mk-* ${FTPDIR}/CVS_Makefiles/files
 
-rm -f ${FTPDIR}/Daily_Makefiles/wx* ${FTPDIR}/Daily_Makefiles/MD5SUM
+rm ${FTPDIR}/CVS_Makefiles/wx* ${FTPDIR}/CVS_Makefiles/MD5SUM
 ##there must be an easier way of doing these links...
-for f in `find ${FTPDIR}/Daily_Makefiles/files -type f -name wx-mk\* -mmin -601` ; do
+for f in `find ${FTPDIR}/CVS_Makefiles/files -type f -name wx-mk\* -mmin -601` ; do
        ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `
 done
-md5sum ${FTPDIR}/Daily_Makefiles/wx* > ${FTPDIR}/Daily_Makefiles/MD5SUM
+md5sum ${FTPDIR}/CVS_Makefiles/wx* > ${FTPDIR}/CVS_Makefiles/MD5SUM
 sleep 10
-echo CVS Makefiles generated from bakefiles last updated at `date -u` > ${FTPDIR}/Daily_Makefiles/updated_at.txt
-
-## Setup.exe
-find ${FTPDIR}/Daily_HEAD/files -type f -name wx\* -mtime +3 | xargs rm -rf
-cp  ${WORKDIR}/archives/win/*.exe ${FTPDIR}/Daily_HEAD/files
-
-rm -f ${FTPDIR}/Daily_HEAD/*.exe ${FTPDIR}/Daily_HEAD/MD5SUM
-##there must be an easier way of doing these links...
-for f in `find ${FTPDIR}/Daily_HEAD/files -type f -name wx\*.exe -mmin -601` ; do
-       ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `
-done
-md5sum ${FTPDIR}/Daily_HEAD/wx* > ${FTPDIR}/Daily_HEAD/MD5SUM
-sleep 10
-echo CVS HEAD  last updated at `date -u` > ${FTPDIR}/Daily_HEAD/updated_at.txt
+echo CVS Makefiles generated from bakefiles last updated at `date -u` > ${FTPDIR}/CVS_Makefiles/updated_at.txt
 
 
 ## Docs...
-find ${FTPDIR}/Daily_Docs/files -type f -name wx\* -mtime +3 | xargs rm -rf
-cp  ${WORKDIR}/archives/wx-doc* ${FTPDIR}/Daily_Docs/files
-cp  ${WORKDIR}/archives/win/wxW* ${FTPDIR}/Daily_Docs/files
+find ${FTPDIR}/CVS_Docs/files -type f -name wxWidgets-Do\* -mtime +3 | xargs rm -rf
+cp  ${WORKDIR}/archives/wxWidgets-Docs-* ${FTPDIR}/CVS_Docs/files
 
-rm -f ${FTPDIR}/Daily_Docs/wx* ${FTPDIR}/Daily_Docs/MD5SUM
+rm ${FTPDIR}/CVS_Docs/wx* ${FTPDIR}/CVS_Docs/MD5SUM
 ##there must be an easier way of doing these links...
-for f in `find ${FTPDIR}/Daily_Docs/files -type f -name wx\* -mmin -601` ; do
+for f in `find ${FTPDIR}/CVS_Docs/files -type f -name wxWidgets-Do\* -mmin -601` ; do
        ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `
 done
-md5sum ${FTPDIR}/Daily_Docs/wx* > ${FTPDIR}/Daily_Docs/MD5SUM
+md5sum ${FTPDIR}/CVS_Docs/wx* > ${FTPDIR}/CVS_Docs/MD5SUM
 sleep 10
-echo CVS Documentation generated from bakefiles last updated at `date -u` > ${FTPDIR}/Daily_Docs/updated_at.txt
+echo CVS Documentation generated from bakefiles last updated at `date -u` > ${FTPDIR}/CVS_Docs/updated_at.txt
 }
 
 do_texrtf ()
 {
 
 ##parameters : subdir_of_tex index.tex  dir_under_wxWidgets
-# need this first time only
-if [ ! -e ${WORKDIR}/archives/html/$1 ] ; then
-  mkdir ${WORKDIR}/archives/html/$1
-fi  
-
-rm -f ${WORKDIR}/archives/html/$1/*
+rm ${WORKDIR}/archives/html/$1/*
 /usr/local/bin/tex2rtf ${WORKDIR}/wxWidgets/$3/docs/latex/$1/$2  ${WORKDIR}/archives/html/$1/$1 -twice -html -macros ${WORKDIR}/wxWidgets/docs/latex/wx/tex2rtf_css.ini
 cp ${WORKDIR}/wxWidgets/$3/docs/latex/$1/*.gif ${WORKDIR}/archives/html/$1
 cp ${WORKDIR}/wxWidgets/$3/docs/latex/$1/*.css ${WORKDIR}/archives/html/$1
@@ -133,12 +128,7 @@ zip -q -9 ${WORKDIR}/archives/htb/$1.htb  *.gif
 do_util_texrtf ()
 {
 ##parameters : subdir_of_tex index.tex 
-# need this first time only
-if [ ! -e ${WORKDIR}/archives/html/$1 ] ; then
-  mkdir ${WORKDIR}/archives/html/$1
-fi
-  
-rm -f ${WORKDIR}/archives/html/$1/*
+rm ${WORKDIR}/archives/html/$1/*
 /usr/local/bin/tex2rtf ${WORKDIR}/wxWidgets/utils/$1/docs/$2  ${WORKDIR}/archives/html/$1/$1 -twice -html -macros ${WORKDIR}/wxWidgets/docs/latex/wx/tex2rtf_css.ini
 cp ${WORKDIR}/wxWidgets/utils/$1/docs/*.gif ${WORKDIR}/archives/html/$1
 cp ${WORKDIR}/wxWidgets/utils/$1/docs/*.css ${WORKDIR}/archives/html/$1
@@ -150,25 +140,27 @@ zip -q -9 ${WORKDIR}/archives/htb/$1.htb  *.gif
 do_docs ()
 {
 ##remove files, then regenerate
-rm ${WORKDIR}/archives/wx-do*
-rm ${WORKDIR}/archives/win/wx*
+rm ${WORKDIR}/archives/wxWidgets-Docs*
 rm ${WORKDIR}/archives/htb/*.*
 
 ######### dir index.tex rootdir
 do_texrtf wx manual.tex
-#do_texrtf book book.tex
-#do_texrtf svg dcsvg.tex contrib
-#do_texrtf ogl ogl.tex contrib
-#do_texrtf mmedia mmedia.tex contrib
-#do_texrtf gizmos manual.tex contrib
-#do_texrtf fl fl.tex contrib
+do_texrtf book book.tex
+do_texrtf svg dcsvg.tex contrib
+do_texrtf ogl ogl.tex contrib
+do_texrtf mmedia mmedia.tex contrib
+do_texrtf gizmos manual.tex contrib
+do_texrtf fl fl.tex contrib
 do_util_texrtf tex2rtf tex2rtf.tex 
 
 cd ${WORKDIR}/archives/
-tar zcvf ${WORKDIR}/archives/wx-docs-html-${CURDATE}.tar.gz `find . -name '*.gif' -print -o -name '*.html' -print` html/wx/*.css
+tar zcvf ${WORKDIR}/archives/wxWidgets-Docs-HTML-${CURDATE}.tar.gz  html/wx/*.html html/wx/*.gif html/wx/*.css
+# TODO: include the extra HTML docs into the above archive.
+# TODO: we need to add the version number to the doc archives
+# tar zcvf ${WORKDIR}/archives/wxWidgets-Docs-Extra-HTML-${CURDATE}.tar.gz `find . -name 'wx' -prune -o -name '*.html' -print`
 
-tar zcvf ${WORKDIR}/archives/wx-docs-htb-${CURDATE}.tar.gz  htb/*
-zip -q -9 ${WORKDIR}/archives/wx-docs-htb-${CURDATE}.zip htb/*
+tar zcvf ${WORKDIR}/archives/wxWidgets-Docs-HTB-${CURDATE}.tar.gz  htb/*.htb
+# tar zcvf ${WORKDIR}/archives/wxWidgets-Docs-Extra-HTB-${CURDATE}.tar.gz --exclude wx.htb htb/*.htb
 
 ##remove .con files
 rm ${WORKDIR}/*.con
@@ -178,21 +170,23 @@ rm ${WORKDIR}/*.con
 
 add_win_files ()
 {
-### starts with wx***.zip
-
-for f in `find ${WINSRCDIR}/ -maxdepth 1 -name wx\*.zip ` ; do       
-       cp $f ${WORKDIR}/archives/win/`basename $f | sed -e "s/.zip//"`-${CURDATE}.zip
+### starts with wxWidgets-Docs-xxx.zip
+for f in `find ${WORKDIR}/archives/win/ -name wx\*.zip ` ; do       
+       mv $f ${WORKDIR}/archives/`basename $f | tr -d ".zip"`-${CURDATE}.zip
        done
 
-for f in `find ${WINSRCDIR}/ -maxdepth 1 -name wx\*.exe ` ; do       
-       cp $f ${WORKDIR}/archives/win/`basename $f | sed -e "s/.exe//"`-${CURDATE}.exe
+rm ${WORKDIR}/archives/*.exe
+for f in `find ${WORKDIR}/archives/win/ -name wx\*.exe ` ; do       
+       mv $f ${WORKDIR}/archives/`basename $f | tr -d ".exe"`-${CURDATE}.exe
        done
 
 }
 
-update_from_svn
+update_from_cvs
 regenerate_makefiles
 package_makefiles
+package_cvs All wxWidgets
+package_cvs Gtk wxGTK
 
 do_docs
 add_win_files

build/script/win_docs.bat

@@ -1,58 +1,40 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss
-rem SET WXW_VER=2.9.0
-if (%WXW_VER%)==() SET WXW_VER=SVN
-
-echo docs building for %WXW_VER%
+SET WXW_VER=2.8.0
+if %WXW_VER%=="" SET WXW_VER=CVS
 
 rem  This builds the docs in %WXWIN% in a number of formats 
 rem  and a clean inno setup in a second tree
-rem  it uses a number of tools nmake, gnuwin32 zip & dos2unix, ghostscript, MS word, cvsNT
+rem  it uses a number of tools nmake, gnuwin32 zip, ghostscript, MS word, cvsNT
 rem  cvs is in the path already from CVSNT install
 rem  writes a log file in c:\
 
-echo Building wxWidgets-%WXW_VER% docs... > c:\temp.log
+echo Building wxWidgets docs... > c:\temp.log
 
 set WXWIN=c:\wx\wxWidgets
 set DAILY=c:\daily
-
-rem svn already in my path...
-set PATH=%PATH%;C:\wx\oldcvs\wxw26b\utils\tex2rtf\src\vc_based;c:\wx\Gnu\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1
+set PATH=%PATH%;C:\wx\wxw26b\utils\tex2rtf\src\vc_based;C:\wx\Gnu\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1
 set PATH=%PATH%;C:\Program Files\gs\gs8.51\lib;C:\Program Files\gs\gs8.51\bin
-rem add nmake to the path to build the docs
-call  \vc6
-echo %PATH% >>  c:\temp.log
-rem add bakefile build...
-set PATH=%PATH%;C:\wx\Bakefile\src
+echo %PATH% >> c:\temp.log
 
-SET >>  c:\temp.log
-
-
-rem update wxwidgets (holds docs) and inno (cvs wxMSW setup.exe only)
+rem update wxwidgets (holds docs) and inno (cvs wxMSW module only)
 c:
 cd %WXWIN%
-svn cleanup >>  c:\temp.log
-svn up >>  c:\temp.log
+cvs up -P -d
+cd \wx\inno\wxWidgets
+cvs up -P
+echo CVS update  >>  c:\temp.log
 
-rem now inno
-cd \wx\inno\wxWidgets >>  c:\temp.log
-del c*.*
-if exist include\wx\msw\setup.h del include\wx\msw\setup.h
-if exist include\wx\univ\setup.h del include\wx\univ\setup.h
-svn cleanup >>  c:\temp.log
-svn up >>  c:\temp.log
-dos2unix configure
-dos2unix config.guess
-dos2unix config.sub
-copy include\wx\msw\setup0.h include\wx\msw\setup.h
-copy include\wx\univ\setup0.h include\wx\univ\setup.h
-echo SVN update  >>  c:\temp.log
-
-rem just build the formats not in the SVN to keep down the .#makefile...
+rem add bakefile build...
+set PATH=%PATH%;C:\wx\Bakefile\src
 cd \wx\inno\wxWidgets\build\bakefiles
 del .bakefile_gen.state
-bakefile_gen -f dmars,dmars_smake,msevc4prj >> c:\temp.log
+bakefile_gen 
 
 
+rem add nmake to the path and build the docs
+call  \vc6
+echo %PATH% >>  c:\temp.log
+SET >>  c:\temp.log
 cd %WXWIN%\build\script
 nmake -f makedocs.vc cleandocs
 nmake -f makedocs.vc alldocs
@@ -67,28 +49,32 @@ start /WAIT winword /mwx_ps
 
 echo cvs doc up part 2 >>  c:\temp.log
 
+rem use ghostscript ps2pdf - add extra path first
+rem set PATH=%PATH%;C:\Program Files\gs\gs8.51\lib;C:\Program Files\gs\gs8.51\bin
+rem set PATH=%PATH%;C:\wx\GnuWin32\bin;C:\PROGRA~1\INNOSE~1
+
 cd %DAILY%\in
 call ps2pdf wx.ps >>  c:\temp.log
+call ps2pdf fl.ps >> c:\temp.log
+call ps2pdf gizmos.ps >> c:\temp.log
+call ps2pdf mmedia.ps >> c:\temp.log
+call ps2pdf ogl.ps >> c:\temp.log
+call ps2pdf svg.ps >> c:\temp.log
 call ps2pdf tex2rtf.ps >> c:\temp.log
 
 echo Zipping
 cd %WXWIN%
-del %DAILY%\*.zip
-zip %DAILY%\wxWidgets-%WXW_VER%-CHM.zip docs\htmlhelp\wx.chm utils/tex2rtf/docs/*.chm 
-zip %DAILY%\wxWidgets-%WXW_VER%-HTB.zip docs\htb\*.htb utils/tex2rtf/docs/*.htb 
-zip %DAILY%\wxWidgets-%WXW_VER%-HLP.zip docs\winhelp\wx.hlp docs\winhelp\wx.cnt utils/tex2rtf/docs/*.HLP utils/tex2rtf/docs/*.cnt 
-zip -r %DAILY%\wxWidgets-%WXW_VER%-HTML.zip docs\html\* utils\tex2rtf\docs\html\* -x CVS -x *.con -x *.hh* -x *.ref -x *.htx -x *.cn1 -x docs\html\CVS\*
-
-del %DAILY%\*.tar.gz
-bsdtar zcvf %DAILY%\wxWidgets-%WXW_VER%-HTB.tar.gz docs/htb/*.htb utils/tex2rtf/docs/*.htb 
-bsdtar zcvf %DAILY%\wxWidgets-%WXW_VER%-HTML.tar.gz  --exclude CVS --exclude *.con --exclude *.hh* --exclude *.ref --exclude *.htx --exclude *.cn1 --exclude docs/html/CVS/* docs/html/* utils/tex2rtf/docs/html/*
+del %DAILY%\*.ZIP
+rem these need to be .ZIP so they will get date on Unix (rebuild_makefiles.sh)
+zip %DAILY%\wxWidgets-%WXW_VER%-CHM.ZIP docs\htmlhelp\wx.chm utils/tex2rtf/docs/*.chm docs/htmlhelp/*.chm
+zip %DAILY%\wxWidgets-%WXW_VER%-HLP.ZIP docs\winhelp\wx.hlp docs\winhelp\wx.cnt utils/tex2rtf/docs/*.HLP utils/tex2rtf/docs/*.cnt docs/winhelp/*.hlp docs/winhelp/*.cnt
 
 cd %DAILY%\
 mkdir docs
 mkdir docs\pdf
 del docs\pdf\*.pdf
 move in\*.pdf docs\pdf
-zip wxWidgets-%WXW_VER%-PDF.zip docs\pdf\*.pdf
+zip wxWidgets-%WXW_VER%-PDF.ZIP docs\pdf\*.pdf
 
 rem copy chm to inno
 cd %WXWIN%
@@ -97,6 +83,15 @@ copy docs\htmlhelp\wx.chm \wx\inno\wxWidgets\docs\htmlhelp\wx.chm
 cd %WXWIN%\build\script
 iscc wxwidgets.iss >> c:\temp.log
 
+echo setting S
+echo yes > net use s: /delete
+net use s: \\biolpc22\bake 
+net use >> c:\temp.log
+
+copy %DAILY%\*.ZIP s:\bkl-cronjob\archives\win
+copy %DAILY%\*.exe s:\bkl-cronjob\archives\win\*.EXE
+dir s: /od >> c:\temp.log
+
 echo docs built for %WXW_VER%
 echo docs built for %WXW_VER% >> c:\temp.log
 

build/script/word_macro.txt

@@ -5,6 +5,11 @@
 Sub wx_ps()
     swxWIN = Environ("WXWIN")
     do_ps swxWIN & "\docs\pdf\", "wx"
+    do_ps swxWIN & "\contrib\docs\latex\svg", "svg"
+    do_ps swxWIN & "\contrib\docs\latex\ogl", "ogl"
+    do_ps swxWIN & "\contrib\docs\latex\mmedia", "mmedia"
+    do_ps swxWIN & "\contrib\docs\latex\gizmos", "gizmos"
+    do_ps swxWIN & "\contrib\docs\latex\fl", "fl"
     do_ps swxWIN & "\utils\tex2rtf\docs", "tex2rtf"
 
     bye_bye

build/script/wxwidgets.iss

@@ -2,16 +2,16 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #if GetEnv("WXW_VER") == "CVS"
-    #define INFOFILE  "C:\wx\inno\wxWidgets\BuildSVN.txt"
-    #define WX_VERSION "SVN"
+    #define INFOFILE  "C:\wx\inno\wxWidgets\BuildCVS.txt"
+    #define SETUPFILENAME  "wxMSW-cvs-Setup"
+    #define WX_VERSION "CVS"
 #else
     #define INFOFILE "C:\wx\inno\wxWidgets\docs\msw\install.txt"
+    #define SETUPFILENAME  "wxMSW-" + GetENV("WXW_VER") + "-Setup"
     #define WX_VERSION GetENV("WXW_VER")
 #endif
 
-#define SETUPFILENAME  "wxMSW-" + GetENV("WXW_VER") + "-Setup"
 
-#define INNODIR "C:\wx\inno\wxWidgets"
 
 [Setup]
 AppName=wxWidgets
@@ -20,28 +20,20 @@ AppPublisher=wxWidgets
 AppPublisherURL=http://www.wxwidgets.org
 AppSupportURL=http://www.wxwidgets.org
 AppUpdatesURL=http://www.wxwidgets.org
-DefaultDirName={sd}\wxWidgets-{#WX_VERSION}
-DefaultGroupName=wxWidgets {#WX_VERSION}
-UsePreviousAppDir=no
+DefaultDirName={sd}\wxWidgets
+DefaultGroupName=wxWidgets
 DisableProgramGroupPage=yes
-LicenseFile={#INNODIR}\docs\licence.txt
-InfoBeforeFile={#INNODIR}\docs\readme.txt
+LicenseFile=C:\wx\inno\wxWidgets\docs\licence.txt
+InfoBeforeFile=C:\wx\inno\wxWidgets\docs\readme.txt
 InfoAfterFile={#INFOFILE}
 OutputDir=c:\daily
 OutputBaseFilename={#SETUPFILENAME}
-SetupIconFile={#INNODIR}\art\wxwin.ico
+SetupIconFile=C:\wx\inno\wxWidgets\art\wxwin.ico
 Compression=lzma
 SolidCompression=yes
 
 [Files]
-; source files
-Source: "{#INNODIR}\*"; DestDir: "{app}"; Excludes: ".cvsignore,cocoa,dfb,mac,gtk,gtk1,mgl,motif,msdos,os2,palmos,wxWindows.xcod*,x11,contrib,debian,distrib,docs,misc,tests,wxPython,*.pch,*.pch++,*.pchmm"; Flags: ignoreversion recursesubdirs createallsubdirs
-; docs and helpfile
-Source: "{#INNODIR}\docs\htmlhelp\*"; DestDir: "{app}\docs\htmlhelp\";  Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#INNODIR}\docs\licence.txt"; DestDir: "{app}\docs\";  Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#INNODIR}\docs\readme.txt"; DestDir: "{app}\docs\";  Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#INNODIR}\docs\changes.txt"; DestDir: "{app}\docs\";  Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#INNODIR}\docs\msw\install.txt"; DestDir: "{app}\docs\msw";  Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\wx\inno\wxWidgets\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [INI]
@@ -50,10 +42,6 @@ Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http
 [Icons]
 Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets {#WX_VERSION}}"; Filename: "{app}\wx.url"
 Name: {group}\wxWidgets Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-Name: {group}\Compiling wxWidgets; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-Name: "{group}\Uninstall wxWidgets {#WX_VERSION}"; Filename: "{uninstallexe}"
 
 
 [UninstallDelete]