rebaked makefiles with 0.2.4 (and now with forgotten files)

author Vadim Zeitlin <vadim@wxwidgets.org>

Wed, 8 Oct 2008 15:47:51 +0000 (15:47 +0000)

committer Vadim Zeitlin <vadim@wxwidgets.org>

Wed, 8 Oct 2008 15:47:51 +0000 (15:47 +0000)
author Vadim Zeitlin <vadim@wxwidgets.org>
Wed, 8 Oct 2008 15:47:51 +0000 (15:47 +0000)
committer Vadim Zeitlin <vadim@wxwidgets.org>
Wed, 8 Oct 2008 15:47:51 +0000 (15:47 +0000)
diff --git a/configure b/configure

index 43017aedf73eec755b47906164754142df7036d0..03c1d7a6b97e28bffb9f2342ff519d4e73c7956f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
  #! /bin/sh
  #! /bin/sh
-# From configure.in Id: configure.in 55576 2008-09-12 20:57:41Z VZ .
+# From configure.in Id: configure.in 56132 2008-10-06 19:48:52Z SC .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
  #
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
  #
@@ -818,6 +818,15 @@ COND_BUILD_RELEASE
  COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT
  COND_BUILD_RELEASE_UNICODE_0
  COND_BUILD_RELEASE_UNICODE_1
  COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT
  COND_BUILD_RELEASE_UNICODE_0
  COND_BUILD_RELEASE_UNICODE_1
+COND_BUILD_debug
+COND_BUILD_debug_DEBUG_FLAG_default
+COND_BUILD_debug_DEBUG_INFO_default
+COND_BUILD_debug_UNICODE_0
+COND_BUILD_debug_UNICODE_1
+COND_BUILD_release
+COND_BUILD_release_DEBUG_INFO_default
+COND_BUILD_release_UNICODE_0
+COND_BUILD_release_UNICODE_1
  COND_DEBUG_FLAG_1
  COND_DEBUG_INFO_0
  COND_DEBUG_INFO_1
  COND_DEBUG_FLAG_1
  COND_DEBUG_INFO_0
  COND_DEBUG_INFO_1
@@ -891,13 +900,13 @@ COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
  COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
  COND_SHARED_0_TOOLKIT_PM_WXUNIV_0
  COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
  COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
  COND_SHARED_0_TOOLKIT_PM_WXUNIV_0
  COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin
  COND_SHARED_0_USE_STC_1
  COND_SHARED_0_USE_STC_1
-COND_SHARED_0_WXUSE_EXPAT_BUILTIN
-COND_SHARED_0_WXUSE_REGEX_BUILTIN
-COND_SHARED_0_WXUSE_ZLIB_BUILTIN
+COND_SHARED_0_wxUSE_EXPAT_builtin
+COND_SHARED_0_wxUSE_REGEX_builtin
+COND_SHARED_0_wxUSE_ZLIB_builtin
  COND_SHARED_1
  COND_SHARED_1_USE_GUI_1_USE_OPENGL_1
  COND_TOOLKIT_
  COND_SHARED_1
  COND_SHARED_1_USE_GUI_1_USE_OPENGL_1
  COND_TOOLKIT_
@@ -911,7 +920,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
  COND_TOOLKIT_GTK_USE_GUI_1
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
  COND_TOOLKIT_GTK_USE_GUI_1
@@ -952,6 +960,9 @@ COND_USE_GUI_1_WXUNIV_1
  COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
  COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
  COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
  COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
  COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
  COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
+COND_USE_GUI_1_wxUSE_LIBJPEG_builtin
+COND_USE_GUI_1_wxUSE_LIBPNG_builtin
+COND_USE_GUI_1_wxUSE_LIBTIFF_builtin
  COND_USE_OPENGL_1
  COND_USE_PCH_1
  COND_USE_PLUGINS_0
  COND_USE_OPENGL_1
  COND_USE_PCH_1
  COND_USE_PLUGINS_0
@@ -976,6 +987,12 @@ COND_WXUSE_LIBPNG_BUILTIN
  COND_WXUSE_LIBTIFF_BUILTIN
  COND_WXUSE_REGEX_BUILTIN
  COND_WXUSE_ZLIB_BUILTIN
  COND_WXUSE_LIBTIFF_BUILTIN
  COND_WXUSE_REGEX_BUILTIN
  COND_WXUSE_ZLIB_BUILTIN
+COND_wxUSE_EXPAT_builtin
+COND_wxUSE_LIBJPEG_builtin
+COND_wxUSE_LIBPNG_builtin
+COND_wxUSE_LIBTIFF_builtin
+COND_wxUSE_REGEX_builtin
+COND_wxUSE_ZLIB_builtin
  DEREZ
  SHARED
  WX_LIBRARY_BASENAME_NOGUI
  DEREZ
  SHARED
  WX_LIBRARY_BASENAME_NOGUI
@@ -33085,7 +33102,7 @@ if test "$wxUSE_OPENGL" = "yes"; then
          { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
  echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
          wxUSE_OPENGL="no"
          { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
  echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
          wxUSE_OPENGL="no"
-    elif test "$wxUSE_OSX_CARBON" = 1 -o test "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
+    elif test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
          OPENGL_LIBS="-framework OpenGL -framework AGL"
      elif test "$wxUSE_MSW" = 1; then
          OPENGL_LIBS="-lopengl32 -lglu32"
          OPENGL_LIBS="-framework OpenGL -framework AGL"
      elif test "$wxUSE_MSW" = 1; then
          OPENGL_LIBS="-lopengl32 -lglu32"
@@ -49289,7 +49306,7 @@ fi
      BAKEFILE_BAKEFILE_M4_VERSION="0.2.3"
  
  
      BAKEFILE_BAKEFILE_M4_VERSION="0.2.3"
  
  
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.3"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.4"
  
  
  
  
  
  
@@ -49550,6 +49567,51 @@ EOF
          COND_BUILD_RELEASE_UNICODE_1=""
      fi
  
          COND_BUILD_RELEASE_UNICODE_1=""
      fi
  
+    COND_BUILD_debug="#"
+    if test "x$BUILD" = "xdebug" ; then
+        COND_BUILD_debug=""
+    fi
+
+    COND_BUILD_debug_DEBUG_FLAG_default="#"
+    if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
+        COND_BUILD_debug_DEBUG_FLAG_default=""
+    fi
+
+    COND_BUILD_debug_DEBUG_INFO_default="#"
+    if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
+        COND_BUILD_debug_DEBUG_INFO_default=""
+    fi
+
+    COND_BUILD_debug_UNICODE_0="#"
+    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
+        COND_BUILD_debug_UNICODE_0=""
+    fi
+
+    COND_BUILD_debug_UNICODE_1="#"
+    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
+        COND_BUILD_debug_UNICODE_1=""
+    fi
+
+    COND_BUILD_release="#"
+    if test "x$BUILD" = "xrelease" ; then
+        COND_BUILD_release=""
+    fi
+
+    COND_BUILD_release_DEBUG_INFO_default="#"
+    if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
+        COND_BUILD_release_DEBUG_INFO_default=""
+    fi
+
+    COND_BUILD_release_UNICODE_0="#"
+    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
+        COND_BUILD_release_UNICODE_0=""
+    fi
+
+    COND_BUILD_release_UNICODE_1="#"
+    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
+        COND_BUILD_release_UNICODE_1=""
+    fi
+
      COND_DEBUG_FLAG_1="#"
      if test "x$DEBUG_FLAG" = "x1" ; then
          COND_DEBUG_FLAG_1=""
      COND_DEBUG_FLAG_1="#"
      if test "x$DEBUG_FLAG" = "x1" ; then
          COND_DEBUG_FLAG_1=""
@@ -49915,19 +49977,19 @@ EOF
          COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
      fi
  
          COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
      fi
  
-    COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
+    COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
      if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
      if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
-        COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
+        COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
      fi
  
      fi
  
-    COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
+    COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
      if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
      if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
-        COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
+        COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin=""
      fi
  
      fi
  
-    COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
+    COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
      if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
      if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
-        COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
+        COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
      fi
  
      COND_SHARED_0_USE_STC_1="#"
      fi
  
      COND_SHARED_0_USE_STC_1="#"
@@ -49935,19 +49997,19 @@ EOF
          COND_SHARED_0_USE_STC_1=""
      fi
  
          COND_SHARED_0_USE_STC_1=""
      fi
  
-    COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#"
+    COND_SHARED_0_wxUSE_EXPAT_builtin="#"
      if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
      if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
-        COND_SHARED_0_WXUSE_EXPAT_BUILTIN=""
+        COND_SHARED_0_wxUSE_EXPAT_builtin=""
      fi
  
      fi
  
-    COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
+    COND_SHARED_0_wxUSE_REGEX_builtin="#"
      if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
      if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
-        COND_SHARED_0_WXUSE_REGEX_BUILTIN=""
+        COND_SHARED_0_wxUSE_REGEX_builtin=""
      fi
  
      fi
  
-    COND_SHARED_0_WXUSE_ZLIB_BUILTIN="#"
+    COND_SHARED_0_wxUSE_ZLIB_builtin="#"
      if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then
      if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then
-        COND_SHARED_0_WXUSE_ZLIB_BUILTIN=""
+        COND_SHARED_0_wxUSE_ZLIB_builtin=""
      fi
  
      COND_SHARED_1="#"
      fi
  
      COND_SHARED_1="#"
@@ -50015,11 +50077,6 @@ EOF
          COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
      fi
  
          COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
      fi
  
-    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
-    fi
-
      COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
      if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
          COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1=""
      COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
      if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
          COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1=""
@@ -50220,6 +50277,21 @@ EOF
          COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
      fi
  
          COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
      fi
  
+    COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
+    fi
+
+    COND_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_USE_GUI_1_wxUSE_LIBPNG_builtin=""
+    fi
+
+    COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
+    fi
+
      COND_USE_OPENGL_1="#"
      if test "x$USE_OPENGL" = "x1" ; then
          COND_USE_OPENGL_1=""
      COND_USE_OPENGL_1="#"
      if test "x$USE_OPENGL" = "x1" ; then
          COND_USE_OPENGL_1=""
@@ -50340,6 +50412,36 @@ EOF
          COND_WXUSE_ZLIB_BUILTIN=""
      fi
  
          COND_WXUSE_ZLIB_BUILTIN=""
      fi
  
+    COND_wxUSE_EXPAT_builtin="#"
+    if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
+        COND_wxUSE_EXPAT_builtin=""
+    fi
+
+    COND_wxUSE_LIBJPEG_builtin="#"
+    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_wxUSE_LIBJPEG_builtin=""
+    fi
+
+    COND_wxUSE_LIBPNG_builtin="#"
+    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_wxUSE_LIBPNG_builtin=""
+    fi
+
+    COND_wxUSE_LIBTIFF_builtin="#"
+    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_wxUSE_LIBTIFF_builtin=""
+    fi
+
+    COND_wxUSE_REGEX_builtin="#"
+    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
+        COND_wxUSE_REGEX_builtin=""
+    fi
+
+    COND_wxUSE_ZLIB_builtin="#"
+    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
+        COND_wxUSE_ZLIB_builtin=""
+    fi
+
  
  
      if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then
  
  
      if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then
@@ -51752,6 +51854,15 @@ COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim
  COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim
  COND_BUILD_RELEASE_UNICODE_0!$COND_BUILD_RELEASE_UNICODE_0$ac_delim
  COND_BUILD_RELEASE_UNICODE_1!$COND_BUILD_RELEASE_UNICODE_1$ac_delim
  COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim
  COND_BUILD_RELEASE_UNICODE_0!$COND_BUILD_RELEASE_UNICODE_0$ac_delim
  COND_BUILD_RELEASE_UNICODE_1!$COND_BUILD_RELEASE_UNICODE_1$ac_delim
+COND_BUILD_debug!$COND_BUILD_debug$ac_delim
+COND_BUILD_debug_DEBUG_FLAG_default!$COND_BUILD_debug_DEBUG_FLAG_default$ac_delim
+COND_BUILD_debug_DEBUG_INFO_default!$COND_BUILD_debug_DEBUG_INFO_default$ac_delim
+COND_BUILD_debug_UNICODE_0!$COND_BUILD_debug_UNICODE_0$ac_delim
+COND_BUILD_debug_UNICODE_1!$COND_BUILD_debug_UNICODE_1$ac_delim
+COND_BUILD_release!$COND_BUILD_release$ac_delim
+COND_BUILD_release_DEBUG_INFO_default!$COND_BUILD_release_DEBUG_INFO_default$ac_delim
+COND_BUILD_release_UNICODE_0!$COND_BUILD_release_UNICODE_0$ac_delim
+COND_BUILD_release_UNICODE_1!$COND_BUILD_release_UNICODE_1$ac_delim
  COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim
  COND_DEBUG_INFO_0!$COND_DEBUG_INFO_0$ac_delim
  COND_DEBUG_INFO_1!$COND_DEBUG_INFO_1$ac_delim
  COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim
  COND_DEBUG_INFO_0!$COND_DEBUG_INFO_0$ac_delim
  COND_DEBUG_INFO_1!$COND_DEBUG_INFO_1$ac_delim
@@ -51825,22 +51936,13 @@ COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim
  COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim
  COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
  COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
  COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim
  COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
  COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
  COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
  COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
-COND_SHARED_0_WXUSE_EXPAT_BUILTIN!$COND_SHARED_0_WXUSE_EXPAT_BUILTIN$ac_delim
-COND_SHARED_0_WXUSE_REGEX_BUILTIN!$COND_SHARED_0_WXUSE_REGEX_BUILTIN$ac_delim
-COND_SHARED_0_WXUSE_ZLIB_BUILTIN!$COND_SHARED_0_WXUSE_ZLIB_BUILTIN$ac_delim
-COND_SHARED_1!$COND_SHARED_1$ac_delim
-COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim
-COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
-COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
-COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
-COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
-COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
+COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim
+COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim
+COND_SHARED_0_wxUSE_ZLIB_builtin!$COND_SHARED_0_wxUSE_ZLIB_builtin$ac_delim
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -51882,11 +51984,19 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
+COND_SHARED_1!$COND_SHARED_1$ac_delim
+COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim
+COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
+COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
+COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
+COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
+COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
+COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
  COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
  COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
@@ -51927,6 +52037,9 @@ COND_USE_GUI_1_WXUNIV_1!$COND_USE_GUI_1_WXUNIV_1$ac_delim
  COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
  COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
  COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
  COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
  COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
  COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
+COND_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
+COND_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
+COND_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
  COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim
  COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
  COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
  COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim
  COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
  COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
@@ -51951,6 +52064,12 @@ COND_WXUSE_LIBPNG_BUILTIN!$COND_WXUSE_LIBPNG_BUILTIN$ac_delim
  COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim
  COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim
  COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim
  COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim
  COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim
  COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim
+COND_wxUSE_EXPAT_builtin!$COND_wxUSE_EXPAT_builtin$ac_delim
+COND_wxUSE_LIBJPEG_builtin!$COND_wxUSE_LIBJPEG_builtin$ac_delim
+COND_wxUSE_LIBPNG_builtin!$COND_wxUSE_LIBPNG_builtin$ac_delim
+COND_wxUSE_LIBTIFF_builtin!$COND_wxUSE_LIBTIFF_builtin$ac_delim
+COND_wxUSE_REGEX_builtin!$COND_wxUSE_REGEX_builtin$ac_delim
+COND_wxUSE_ZLIB_builtin!$COND_wxUSE_ZLIB_builtin$ac_delim
  DEREZ!$DEREZ$ac_delim
  SHARED!$SHARED$ac_delim
  WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
  DEREZ!$DEREZ$ac_delim
  SHARED!$SHARED$ac_delim
  WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
@@ -51962,23 +52081,6 @@ TOOLKIT!$TOOLKIT$ac_delim
  TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim
  TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim
  TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim
  TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim
  TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim
  TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim
-cross_compiling!$cross_compiling$ac_delim
-WIDGET_SET!$WIDGET_SET$ac_delim
-WX_RELEASE!$WX_RELEASE$ac_delim
-WX_VERSION!$WX_VERSION$ac_delim
-WX_SUBVERSION!$WX_SUBVERSION$ac_delim
-WX_CHARTYPE!$WX_CHARTYPE$ac_delim
-WX_DEBUGTYPE!$WX_DEBUGTYPE$ac_delim
-WXCONFIG_CPPFLAGS!$WXCONFIG_CPPFLAGS$ac_delim
-WXCONFIG_CFLAGS!$WXCONFIG_CFLAGS$ac_delim
-WXCONFIG_CXXFLAGS!$WXCONFIG_CXXFLAGS$ac_delim
-WXCONFIG_LIBS!$WXCONFIG_LIBS$ac_delim
-WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim
-WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
-WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
-GUIDIST!$GUIDIST$ac_delim
-DISTDIR!$DISTDIR$ac_delim
-SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52020,6 +52122,23 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
+cross_compiling!$cross_compiling$ac_delim
+WIDGET_SET!$WIDGET_SET$ac_delim
+WX_RELEASE!$WX_RELEASE$ac_delim
+WX_VERSION!$WX_VERSION$ac_delim
+WX_SUBVERSION!$WX_SUBVERSION$ac_delim
+WX_CHARTYPE!$WX_CHARTYPE$ac_delim
+WX_DEBUGTYPE!$WX_DEBUGTYPE$ac_delim
+WXCONFIG_CPPFLAGS!$WXCONFIG_CPPFLAGS$ac_delim
+WXCONFIG_CFLAGS!$WXCONFIG_CFLAGS$ac_delim
+WXCONFIG_CXXFLAGS!$WXCONFIG_CXXFLAGS$ac_delim
+WXCONFIG_LIBS!$WXCONFIG_LIBS$ac_delim
+WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim
+WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
+WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
+GUIDIST!$GUIDIST$ac_delim
+DISTDIR!$DISTDIR$ac_delim
+SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
  LDFLAGS_GL!$LDFLAGS_GL$ac_delim
  OPENGL_LIBS!$OPENGL_LIBS$ac_delim
  DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
  LDFLAGS_GL!$LDFLAGS_GL$ac_delim
  OPENGL_LIBS!$OPENGL_LIBS$ac_delim
  DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
@@ -52039,7 +52158,7 @@ LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 34; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/demos/Makefile.in b/demos/Makefile.in

index b5581836660786ee263a3ed78951cc51bfecfa80..1eb0a6ec1de9777a184f04782f4787071e9a2753 100644 (file)
--- a/demos/Makefile.in
+++ b/demos/Makefile.in
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -23,7 +23,7 @@ DESTDIR =
  
  all: bombs forty fractal life poem
  
  
  all: bombs forty fractal life poem
  
-install: all
+install: 
  
  uninstall: 
  
  
  uninstall: 
  
diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in

index 3d790061dcdfbafc38f887209b588d068599cc0b..d853df8430e7b64e4c58ee67d73ed339af7612b2 100644 (file)
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/Makefile.in
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -61,7 +61,7 @@ BOMBS_OBJECTS =  \
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
@@ -112,28 +112,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  
  ### Targets: ###
  
  all: bombs$(EXEEXT) $(__bombs_bundle___depname)
  
  
  ### Targets: ###
  
  all: bombs$(EXEEXT) $(__bombs_bundle___depname)
  
-install: all
+install: 
  
  uninstall: 
  
  
  uninstall: 
  
@@ -149,7 +149,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc)
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc)
-       $(CXX) -o $@ $(BOMBS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(BOMBS_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
         
         $(__bombs___mac_setfilecmd)
         $(__bombs___os2_emxbindcmd)
         
         $(__bombs___mac_setfilecmd)
         $(__bombs___os2_emxbindcmd)
@@ -200,6 +200,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
  
  .PHONY: all install uninstall clean distclean bombs_bundle
  
  .PHONY: all install uninstall clean distclean bombs_bundle
diff --git a/demos/bombs/bombs_vc7.vcproj b/demos/bombs/bombs_vc7.vcproj

index 2fa782e00815acb2985b28b99c6aa4ed7c8fc065..9c4738c6b0667036fecd5b48f074465554a8337a 100644 (file)
--- a/demos/bombs/bombs_vc7.vcproj
+++ b/demos/bombs/bombs_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -22,74 +22,60 @@
                         IntermediateDirectory="vc_mswunivudll\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivudll\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivudll\bombs\"\r
                                 ObjectFile="vc_mswunivudll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivudll\bombs\"\r
                                 ObjectFile="vc_mswunivudll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\bombs.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivudll\bombs.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivudll\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\bombs_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
@@ -97,74 +83,63 @@
                         IntermediateDirectory="vc_mswunivuddll\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivuddll\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivuddll\bombs\"\r
                                 ObjectFile="vc_mswunivuddll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivuddll\bombs\"\r
                                 ObjectFile="vc_mswunivuddll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\bombs.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\bombs.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\bombs_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
@@ -172,74 +147,60 @@
                         IntermediateDirectory="vc_mswudll\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswudll\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswudll\bombs\"\r
                                 ObjectFile="vc_mswudll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswudll\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswudll\bombs\"\r
                                 ObjectFile="vc_mswudll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswudll\bombs.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswudll\bombs.pdb"\r
                                 ProgramDatabaseFile="vc_mswudll\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\bombs_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
@@ -247,74 +208,63 @@
                         IntermediateDirectory="vc_mswuddll\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswuddll\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswuddll\bombs\"\r
                                 ObjectFile="vc_mswuddll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswuddll\bombs\"\r
                                 ObjectFile="vc_mswuddll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\bombs.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswuddll\bombs.pdb"\r
                                 ProgramDatabaseFile="vc_mswuddll\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\bombs_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
@@ -322,74 +272,60 @@
                         IntermediateDirectory="vc_mswunivu\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivu\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivu\bombs\"\r
                                 ObjectFile="vc_mswunivu\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivu\bombs\"\r
                                 ObjectFile="vc_mswunivu\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\bombs.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivu\bombs.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivu\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\bombs_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
@@ -397,74 +333,63 @@
                         IntermediateDirectory="vc_mswunivud\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivud\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivud\bombs\"\r
                                 ObjectFile="vc_mswunivud\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivud\bombs\"\r
                                 ObjectFile="vc_mswunivud\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\bombs.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivud\bombs.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivud\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\bombs_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
@@ -472,74 +397,60 @@
                         IntermediateDirectory="vc_mswu\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswu\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswu\bombs\"\r
                                 ObjectFile="vc_mswu\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswu\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswu\bombs\"\r
                                 ObjectFile="vc_mswu\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswu\bombs.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswu\bombs.pdb"\r
                                 ProgramDatabaseFile="vc_mswu\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\bombs_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
@@ -547,74 +458,63 @@
                         IntermediateDirectory="vc_mswud\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswud\bombs"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswud\bombs\"\r
                                 ObjectFile="vc_mswud\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswud\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswud\bombs\"\r
                                 ObjectFile="vc_mswud\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswud\bombs.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswud\bombs.pdb"\r
                                 ProgramDatabaseFile="vc_mswud\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\bombs_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
@@ -623,21 +523,25 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\bombs.cpp"/>\r
+                               RelativePath=".\bombs.cpp">\r
+                       </File>\r
                         <File\r
                         <File\r
-                               RelativePath=".\bombs1.cpp"/>\r
+                               RelativePath=".\bombs1.cpp">\r
+                       </File>\r
                         <File\r
                         <File\r
-                               RelativePath=".\game.cpp"/>\r
+                               RelativePath=".\game.cpp">\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\bombs.rc"/>\r
+                               RelativePath=".\bombs.rc">\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/demos/bombs/bombs_vc8.vcproj b/demos/bombs/bombs_vc8.vcproj

index 9e1f84f0dbfd99f208a747e3b6538ecf33e03237..810d0cc423e766159d19c2e19e63f0878ec53c01 100644 (file)
--- a/demos/bombs/bombs_vc8.vcproj
+++ b/demos/bombs/bombs_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -43,57 +43,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\bombs\"\r
                                 ObjectFile="vc_mswunivudll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\bombs\"\r
                                 ObjectFile="vc_mswunivudll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\bombs.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -137,57 +136,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\bombs\"\r
                                 ObjectFile="vc_mswunivuddll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\bombs\"\r
                                 ObjectFile="vc_mswunivuddll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\bombs.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -231,57 +232,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\bombs\"\r
                                 ObjectFile="vc_mswudll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswudll\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\bombs\"\r
                                 ObjectFile="vc_mswudll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswudll\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\bombs.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -325,57 +325,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\bombs\"\r
                                 ObjectFile="vc_mswuddll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\bombs\"\r
                                 ObjectFile="vc_mswuddll\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\bombs.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -419,57 +421,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\bombs\"\r
                                 ObjectFile="vc_mswunivu\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\bombs\"\r
                                 ObjectFile="vc_mswunivu\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\bombs.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -513,57 +514,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\bombs\"\r
                                 ObjectFile="vc_mswunivud\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\bombs\"\r
                                 ObjectFile="vc_mswunivud\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\bombs.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -607,57 +610,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\bombs\"\r
                                 ObjectFile="vc_mswu\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswu\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\bombs\"\r
                                 ObjectFile="vc_mswu\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswu\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\bombs.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -701,57 +703,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\bombs\"\r
                                 ObjectFile="vc_mswud\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswud\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\bombs\"\r
                                 ObjectFile="vc_mswud\bombs\"\r
                                 ProgramDataBaseFileName="vc_mswud\bombs.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\bombs.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\bombs.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\bombs.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\bombs.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -780,27 +784,31 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         >\r
                         <File\r
                                 RelativePath=".\bombs.cpp"\r
                         >\r
                         <File\r
                                 RelativePath=".\bombs.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\bombs1.cpp"\r
                         <File\r
                                 RelativePath=".\bombs1.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\game.cpp"\r
                         <File\r
                                 RelativePath=".\game.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         >\r
                         <File\r
                                 RelativePath=".\bombs.rc"\r
                         >\r
                         <File\r
                                 RelativePath=".\bombs.rc"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/demos/bombs/makefile.bcc b/demos/bombs/makefile.bcc

index 235ccc5b058cbde43f45153ada36b0abf2f2692e..9d20408f3ba62b2cae02b368318596340036cfe9 100644 (file)
--- a/demos/bombs/makefile.bcc
+++ b/demos/bombs/makefile.bcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -231,7 +231,7 @@ clean:
         -if exist $(OBJS)\bombs.ils del $(OBJS)\bombs.ils
  
  $(OBJS)\bombs.exe: $(BOMBS_OBJECTS)  $(OBJS)\bombs_bombs.res
         -if exist $(OBJS)\bombs.ils del $(OBJS)\bombs.ils
  
  $(OBJS)\bombs.exe: $(BOMBS_OBJECTS)  $(OBJS)\bombs_bombs.res
-       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
         c0w32.obj $(BOMBS_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\bombs_bombs.res
  |
  
         c0w32.obj $(BOMBS_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\bombs_bombs.res
  |
  
diff --git a/demos/bombs/makefile.gcc b/demos/bombs/makefile.gcc

index 2708e09338cd6c9d2eae52cbd6b5cf5db981d403..ef96e89ea99986675510f685c45cbb7fb77279db 100644 (file)
--- a/demos/bombs/makefile.gcc
+++ b/demos/bombs/makefile.gcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
  
  ### Variables: ###
  
  
  ### Variables: ###
  
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
@@ -226,7 +226,7 @@ clean:
         -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe
  
  $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs_rc.o
         -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe
  
  $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs_rc.o
-       $(CXX) -o $@ $(BOMBS_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(BOMBS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
  
  $(OBJS)\bombs_bombs.o: ./bombs.cpp
         $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $<
  
  $(OBJS)\bombs_bombs.o: ./bombs.cpp
         $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $<
diff --git a/demos/bombs/makefile.vc b/demos/bombs/makefile.vc

index ad7fadcbc73e26c0fe54e24d3ef13cc1cd9628c6..e3ceb2486272b909e3d24c78fa874142562e875f 100644 (file)
--- a/demos/bombs/makefile.vc
+++ b/demos/bombs/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -54,18 +54,18 @@ WXUNICODEFLAG = u
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  DIR_SUFFIX_CPU = _amd64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
@@ -75,18 +75,18 @@ LIBTYPE_SUFFIX = lib
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
@@ -307,7 +307,7 @@ clean:
         -if exist $(OBJS)\bombs.pdb del $(OBJS)\bombs.pdb
  
  $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res
         -if exist $(OBJS)\bombs.pdb del $(OBJS)\bombs.pdb
  
  $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
         $(BOMBS_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
         $(BOMBS_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
diff --git a/demos/bombs/makefile.wat b/demos/bombs/makefile.wat

index 4972ec06482e8f0a41953295bca204d62951ccbe..03a1b2cf7ed774ac139c2e3f7348b9cb70b86731 100644 (file)
--- a/demos/bombs/makefile.wat
+++ b/demos/bombs/makefile.wat
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -253,7 +253,7 @@ $(OBJS)\bombs.exe :  $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res
         @%append $(OBJS)\bombs.lbc option quiet
         @%append $(OBJS)\bombs.lbc name $^@
         @%append $(OBJS)\bombs.lbc option caseexact
         @%append $(OBJS)\bombs.lbc option quiet
         @%append $(OBJS)\bombs.lbc name $^@
         @%append $(OBJS)\bombs.lbc option caseexact
-       @%append $(OBJS)\bombs.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\bombs.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
         @for %i in ($(BOMBS_OBJECTS)) do @%append $(OBJS)\bombs.lbc file %i
         @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\bombs.lbc library %i
         @%append $(OBJS)\bombs.lbc option resource=$(OBJS)\bombs_bombs.res
         @for %i in ($(BOMBS_OBJECTS)) do @%append $(OBJS)\bombs.lbc file %i
         @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\bombs.lbc library %i
         @%append $(OBJS)\bombs.lbc option resource=$(OBJS)\bombs_bombs.res
diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in

index 46bb7b5ce7fc955881e95d08a020e4d8ef079f35..a7fa8c9db0834c7262ac5398096d23c05d7c45c1 100644 (file)
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -70,7 +70,7 @@ FORTY_OBJECTS =  \
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
@@ -130,28 +130,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  
  ### Targets: ###
  
  all: forty$(EXEEXT) $(__forty_bundle___depname) data
  
  
  ### Targets: ###
  
  all: forty$(EXEEXT) $(__forty_bundle___depname) data
  
-install: all
+install: 
  
  uninstall: 
  
  
  uninstall: 
  
@@ -167,7 +167,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
-       $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(FORTY_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
         
         $(__forty___mac_setfilecmd)
         $(__forty___os2_emxbindcmd)
         
         $(__forty___mac_setfilecmd)
         $(__forty___os2_emxbindcmd)
@@ -245,6 +245,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
  
  .PHONY: all install uninstall clean distclean forty_bundle data
  
  .PHONY: all install uninstall clean distclean forty_bundle data
diff --git a/demos/forty/forty_vc7.vcproj b/demos/forty/forty_vc7.vcproj

index 5ebc653132bab115e306e3a53cf40847d351b1e5..d2bbb4058fd7bd64050ad5dc48c2c6bdc2138ddb 100644 (file)
--- a/demos/forty/forty_vc7.vcproj
+++ b/demos/forty/forty_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -22,74 +22,60 @@
                         IntermediateDirectory="vc_mswunivudll\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivudll\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivudll\forty\"\r
                                 ObjectFile="vc_mswunivudll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\forty.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivudll\forty\"\r
                                 ObjectFile="vc_mswunivudll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\forty.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivudll\forty.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivudll\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\forty_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
@@ -97,74 +83,63 @@
                         IntermediateDirectory="vc_mswunivuddll\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivuddll\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivuddll\forty\"\r
                                 ObjectFile="vc_mswunivuddll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\forty.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivuddll\forty\"\r
                                 ObjectFile="vc_mswunivuddll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\forty.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_adv.lib  wxbase29ud_xml.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_adv.lib  wxbase29ud_xml.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\forty.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\forty_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
@@ -172,74 +147,60 @@
                         IntermediateDirectory="vc_mswudll\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswudll\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswudll\forty\"\r
                                 ObjectFile="vc_mswudll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswudll\forty.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswudll\forty\"\r
                                 ObjectFile="vc_mswudll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswudll\forty.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswudll\forty.pdb"\r
                                 ProgramDatabaseFile="vc_mswudll\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\forty_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
@@ -247,74 +208,63 @@
                         IntermediateDirectory="vc_mswuddll\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswuddll\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswuddll\forty\"\r
                                 ObjectFile="vc_mswuddll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\forty.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswuddll\forty\"\r
                                 ObjectFile="vc_mswuddll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\forty.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_adv.lib  wxbase29ud_xml.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_adv.lib  wxbase29ud_xml.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswuddll\forty.pdb"\r
                                 ProgramDatabaseFile="vc_mswuddll\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\forty_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
@@ -322,74 +272,60 @@
                         IntermediateDirectory="vc_mswunivu\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivu\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivu\forty\"\r
                                 ObjectFile="vc_mswunivu\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\forty.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivu\forty\"\r
                                 ObjectFile="vc_mswunivu\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\forty.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivu\forty.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivu\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\forty_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
@@ -397,74 +333,63 @@
                         IntermediateDirectory="vc_mswunivud\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivud\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivud\forty\"\r
                                 ObjectFile="vc_mswunivud\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\forty.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivud\forty\"\r
                                 ObjectFile="vc_mswunivud\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\forty.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_adv.lib  wxbase29ud_xml.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_adv.lib  wxbase29ud_xml.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivud\forty.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivud\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\forty_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
@@ -472,74 +397,60 @@
                         IntermediateDirectory="vc_mswu\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswu\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswu\forty\"\r
                                 ObjectFile="vc_mswu\forty\"\r
                                 ProgramDataBaseFileName="vc_mswu\forty.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswu\forty\"\r
                                 ObjectFile="vc_mswu\forty\"\r
                                 ProgramDataBaseFileName="vc_mswu\forty.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswu\forty.pdb"\r
                                 ProgramDatabaseFile="vc_mswu\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\forty_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
@@ -547,74 +458,63 @@
                         IntermediateDirectory="vc_mswud\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswud\forty"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswud\forty\"\r
                                 ObjectFile="vc_mswud\forty\"\r
                                 ProgramDataBaseFileName="vc_mswud\forty.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswud\forty\"\r
                                 ObjectFile="vc_mswud\forty\"\r
                                 ProgramDataBaseFileName="vc_mswud\forty.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_adv.lib  wxbase29ud_xml.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_adv.lib  wxbase29ud_xml.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswud\forty.pdb"\r
                                 ProgramDatabaseFile="vc_mswud\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\forty_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
@@ -623,31 +523,40 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\canvas.cpp"/>\r
+                               RelativePath=".\canvas.cpp">\r
+                       </File>\r
                         <File\r
                         <File\r
-                               RelativePath=".\card.cpp"/>\r
+                               RelativePath=".\card.cpp">\r
+                       </File>\r
                         <File\r
                         <File\r
-                               RelativePath=".\forty.cpp"/>\r
+                               RelativePath=".\forty.cpp">\r
+                       </File>\r
                         <File\r
                         <File\r
-                               RelativePath=".\game.cpp"/>\r
+                               RelativePath=".\game.cpp">\r
+                       </File>\r
                         <File\r
                         <File\r
-                               RelativePath=".\pile.cpp"/>\r
+                               RelativePath=".\pile.cpp">\r
+                       </File>\r
                         <File\r
                         <File\r
-                               RelativePath=".\playerdg.cpp"/>\r
+                               RelativePath=".\playerdg.cpp">\r
+                       </File>\r
                         <File\r
                         <File\r
-                               RelativePath=".\scoredg.cpp"/>\r
+                               RelativePath=".\scoredg.cpp">\r
+                       </File>\r
                         <File\r
                         <File\r
-                               RelativePath=".\scorefil.cpp"/>\r
+                               RelativePath=".\scorefil.cpp">\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\forty.rc"/>\r
+                               RelativePath=".\forty.rc">\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/demos/forty/forty_vc8.vcproj b/demos/forty/forty_vc8.vcproj

index cbc3812e23c2c7d4a650511b054818cf984a4a5a..1340c110e976262b959cd7a0fdfbaa33c2f2ad83 100644 (file)
--- a/demos/forty/forty_vc8.vcproj
+++ b/demos/forty/forty_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -43,57 +43,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\forty\"\r
                                 ObjectFile="vc_mswunivudll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\forty\"\r
                                 ObjectFile="vc_mswunivudll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\forty.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -137,57 +136,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\forty\"\r
                                 ObjectFile="vc_mswunivuddll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\forty\"\r
                                 ObjectFile="vc_mswunivuddll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_adv.lib  wxbase29ud_xml.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_adv.lib  wxbase29ud_xml.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\forty.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -231,57 +232,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\forty\"\r
                                 ObjectFile="vc_mswudll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswudll\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\forty\"\r
                                 ObjectFile="vc_mswudll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswudll\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\forty.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -325,57 +325,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\forty\"\r
                                 ObjectFile="vc_mswuddll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\forty\"\r
                                 ObjectFile="vc_mswuddll\forty\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_adv.lib  wxbase29ud_xml.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_adv.lib  wxbase29ud_xml.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\forty.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -419,57 +421,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\forty\"\r
                                 ObjectFile="vc_mswunivu\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\forty\"\r
                                 ObjectFile="vc_mswunivu\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\forty.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -513,57 +514,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\forty\"\r
                                 ObjectFile="vc_mswunivud\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\forty\"\r
                                 ObjectFile="vc_mswunivud\forty\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_adv.lib  wxbase29ud_xml.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_adv.lib  wxbase29ud_xml.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\forty.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -607,57 +610,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\forty\"\r
                                 ObjectFile="vc_mswu\forty\"\r
                                 ProgramDataBaseFileName="vc_mswu\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\forty\"\r
                                 ObjectFile="vc_mswu\forty\"\r
                                 ProgramDataBaseFileName="vc_mswu\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\forty.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -701,57 +703,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\forty\"\r
                                 ObjectFile="vc_mswud\forty\"\r
                                 ProgramDataBaseFileName="vc_mswud\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\forty\"\r
                                 ObjectFile="vc_mswud\forty\"\r
                                 ProgramDataBaseFileName="vc_mswud\forty.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_adv.lib  wxbase29ud_xml.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_adv.lib  wxbase29ud_xml.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\forty.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\forty.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\forty.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\forty.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -780,42 +784,51 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         >\r
                         <File\r
                                 RelativePath=".\canvas.cpp"\r
                         >\r
                         <File\r
                                 RelativePath=".\canvas.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\card.cpp"\r
                         <File\r
                                 RelativePath=".\card.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\forty.cpp"\r
                         <File\r
                                 RelativePath=".\forty.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\game.cpp"\r
                         <File\r
                                 RelativePath=".\game.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\pile.cpp"\r
                         <File\r
                                 RelativePath=".\pile.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\playerdg.cpp"\r
                         <File\r
                                 RelativePath=".\playerdg.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\scoredg.cpp"\r
                         <File\r
                                 RelativePath=".\scoredg.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\scorefil.cpp"\r
                         <File\r
                                 RelativePath=".\scorefil.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         >\r
                         <File\r
                                 RelativePath=".\forty.rc"\r
                         >\r
                         <File\r
                                 RelativePath=".\forty.rc"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/demos/forty/makefile.bcc b/demos/forty/makefile.bcc

index 96b5d1b3b5efa05ae14b6776bed28798bdebb14c..dc2aed0750bad462302143cc2d2e76c76f9491e9 100644 (file)
--- a/demos/forty/makefile.bcc
+++ b/demos/forty/makefile.bcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -248,7 +248,7 @@ clean:
         -if exist $(OBJS)\forty.ils del $(OBJS)\forty.ils
  
  $(OBJS)\forty.exe: $(FORTY_OBJECTS)  $(OBJS)\forty_forty.res
         -if exist $(OBJS)\forty.ils del $(OBJS)\forty.ils
  
  $(OBJS)\forty.exe: $(FORTY_OBJECTS)  $(OBJS)\forty_forty.res
-       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
         c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\forty_forty.res
  |
  
         c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\forty_forty.res
  |
  
diff --git a/demos/forty/makefile.gcc b/demos/forty/makefile.gcc

index c8fd3db588c5061a81badea37d46583558d9bf0b..016e9c5a72249c5bc772c89fb558d12f1fc8cbea 100644 (file)
--- a/demos/forty/makefile.gcc
+++ b/demos/forty/makefile.gcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
  
  ### Variables: ###
  
  
  ### Variables: ###
  
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
@@ -243,7 +243,7 @@ clean:
         -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe
  
  $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty_rc.o
         -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe
  
  $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty_rc.o
-       $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(FORTY_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
  
  data: 
         if not exist $(OBJS) mkdir $(OBJS)
  
  data: 
         if not exist $(OBJS) mkdir $(OBJS)
diff --git a/demos/forty/makefile.vc b/demos/forty/makefile.vc

index 2a4a81909841bd0ef8cd2c8a2ada823a54526a0a..7e942c6238be9e83281e24327b4e8c788549d023 100644 (file)
--- a/demos/forty/makefile.vc
+++ b/demos/forty/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -59,18 +59,18 @@ WXUNICODEFLAG = u
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  DIR_SUFFIX_CPU = _amd64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
@@ -80,18 +80,18 @@ LIBTYPE_SUFFIX = lib
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
@@ -324,7 +324,7 @@ clean:
         -if exist $(OBJS)\forty.pdb del $(OBJS)\forty.pdb
  
  $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
         -if exist $(OBJS)\forty.pdb del $(OBJS)\forty.pdb
  
  $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
         $(FORTY_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
         $(FORTY_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
diff --git a/demos/forty/makefile.wat b/demos/forty/makefile.wat

index e0649b21bebcc39cf88d79c01cd7e59f194da58b..f18bd0f4725b61991580236ba8db208619147889 100644 (file)
--- a/demos/forty/makefile.wat
+++ b/demos/forty/makefile.wat
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -273,7 +273,7 @@ $(OBJS)\forty.exe :  $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
         @%append $(OBJS)\forty.lbc option quiet
         @%append $(OBJS)\forty.lbc name $^@
         @%append $(OBJS)\forty.lbc option caseexact
         @%append $(OBJS)\forty.lbc option quiet
         @%append $(OBJS)\forty.lbc name $^@
         @%append $(OBJS)\forty.lbc option caseexact
-       @%append $(OBJS)\forty.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\forty.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
         @for %i in ($(FORTY_OBJECTS)) do @%append $(OBJS)\forty.lbc file %i
         @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\forty.lbc library %i
         @%append $(OBJS)\forty.lbc option resource=$(OBJS)\forty_forty.res
         @for %i in ($(FORTY_OBJECTS)) do @%append $(OBJS)\forty.lbc file %i
         @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\forty.lbc library %i
         @%append $(OBJS)\forty.lbc option resource=$(OBJS)\forty_forty.res
diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in

index 8b534aac8eb90d671204f163aa4699ce4a375727..bbc3248965df495e5c8cd1f96f3c602f697ac571 100644 (file)
--- a/demos/fractal/Makefile.in
+++ b/demos/fractal/Makefile.in
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -59,7 +59,7 @@ FRACTAL_OBJECTS =  \
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
@@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  
  ### Targets: ###
  
  all: fractal$(EXEEXT) $(__fractal_bundle___depname)
  
  
  ### Targets: ###
  
  all: fractal$(EXEEXT) $(__fractal_bundle___depname)
  
-install: all
+install: 
  
  uninstall: 
  
  
  uninstall: 
  
@@ -147,7 +147,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
-       $(CXX) -o $@ $(FRACTAL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(FRACTAL_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
         
         $(__fractal___mac_setfilecmd)
         $(__fractal___os2_emxbindcmd)
         
         $(__fractal___mac_setfilecmd)
         $(__fractal___os2_emxbindcmd)
@@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
  
  .PHONY: all install uninstall clean distclean fractal_bundle
  
  .PHONY: all install uninstall clean distclean fractal_bundle
diff --git a/demos/fractal/fractal_vc7.vcproj b/demos/fractal/fractal_vc7.vcproj

index 57a8348120fd40b2441c144772dd19b7546a9f5c..42626d75ec465654a45ca342b5518b56a530b715 100644 (file)
--- a/demos/fractal/fractal_vc7.vcproj
+++ b/demos/fractal/fractal_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -22,74 +22,60 @@
                         IntermediateDirectory="vc_mswunivudll\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivudll\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivudll\fractal\"\r
                                 ObjectFile="vc_mswunivudll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivudll\fractal\"\r
                                 ObjectFile="vc_mswunivudll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\fractal.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivudll\fractal.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivudll\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\fractal_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
@@ -97,74 +83,63 @@
                         IntermediateDirectory="vc_mswunivuddll\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivuddll\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivuddll\fractal\"\r
                                 ObjectFile="vc_mswunivuddll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivuddll\fractal\"\r
                                 ObjectFile="vc_mswunivuddll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\fractal.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\fractal.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\fractal_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
@@ -172,74 +147,60 @@
                         IntermediateDirectory="vc_mswudll\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswudll\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswudll\fractal\"\r
                                 ObjectFile="vc_mswudll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswudll\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswudll\fractal\"\r
                                 ObjectFile="vc_mswudll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswudll\fractal.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswudll\fractal.pdb"\r
                                 ProgramDatabaseFile="vc_mswudll\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\fractal_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
@@ -247,74 +208,63 @@
                         IntermediateDirectory="vc_mswuddll\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswuddll\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswuddll\fractal\"\r
                                 ObjectFile="vc_mswuddll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswuddll\fractal\"\r
                                 ObjectFile="vc_mswuddll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\fractal.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswuddll\fractal.pdb"\r
                                 ProgramDatabaseFile="vc_mswuddll\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\fractal_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
@@ -322,74 +272,60 @@
                         IntermediateDirectory="vc_mswunivu\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivu\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivu\fractal\"\r
                                 ObjectFile="vc_mswunivu\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivu\fractal\"\r
                                 ObjectFile="vc_mswunivu\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\fractal.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivu\fractal.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivu\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\fractal_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
@@ -397,74 +333,63 @@
                         IntermediateDirectory="vc_mswunivud\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivud\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivud\fractal\"\r
                                 ObjectFile="vc_mswunivud\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivud\fractal\"\r
                                 ObjectFile="vc_mswunivud\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\fractal.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivud\fractal.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivud\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\fractal_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
@@ -472,74 +397,60 @@
                         IntermediateDirectory="vc_mswu\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswu\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswu\fractal\"\r
                                 ObjectFile="vc_mswu\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswu\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswu\fractal\"\r
                                 ObjectFile="vc_mswu\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswu\fractal.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswu\fractal.pdb"\r
                                 ProgramDatabaseFile="vc_mswu\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\fractal_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
@@ -547,74 +458,63 @@
                         IntermediateDirectory="vc_mswud\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswud\fractal"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswud\fractal\"\r
                                 ObjectFile="vc_mswud\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswud\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswud\fractal\"\r
                                 ObjectFile="vc_mswud\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswud\fractal.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswud\fractal.pdb"\r
                                 ProgramDatabaseFile="vc_mswud\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\fractal_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
@@ -623,17 +523,19 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\fractal.cpp"/>\r
+                               RelativePath=".\fractal.cpp">\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\fractal.rc"/>\r
+                               RelativePath=".\fractal.rc">\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/demos/fractal/fractal_vc8.vcproj b/demos/fractal/fractal_vc8.vcproj

index ead64194d0170c5f3491651c09062fc507140c84..62a4f03a5bd860e41412c094364e9315e4b52fb7 100644 (file)
--- a/demos/fractal/fractal_vc8.vcproj
+++ b/demos/fractal/fractal_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -43,57 +43,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\fractal\"\r
                                 ObjectFile="vc_mswunivudll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\fractal\"\r
                                 ObjectFile="vc_mswunivudll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\fractal.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -137,57 +136,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\fractal\"\r
                                 ObjectFile="vc_mswunivuddll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\fractal\"\r
                                 ObjectFile="vc_mswunivuddll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\fractal.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -231,57 +232,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\fractal\"\r
                                 ObjectFile="vc_mswudll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswudll\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\fractal\"\r
                                 ObjectFile="vc_mswudll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswudll\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\fractal.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -325,57 +325,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\fractal\"\r
                                 ObjectFile="vc_mswuddll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\fractal\"\r
                                 ObjectFile="vc_mswuddll\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\fractal.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -419,57 +421,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\fractal\"\r
                                 ObjectFile="vc_mswunivu\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\fractal\"\r
                                 ObjectFile="vc_mswunivu\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\fractal.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -513,57 +514,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\fractal\"\r
                                 ObjectFile="vc_mswunivud\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\fractal\"\r
                                 ObjectFile="vc_mswunivud\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\fractal.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -607,57 +610,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\fractal\"\r
                                 ObjectFile="vc_mswu\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswu\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\fractal\"\r
                                 ObjectFile="vc_mswu\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswu\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\fractal.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -701,57 +703,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\fractal\"\r
                                 ObjectFile="vc_mswud\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswud\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\fractal\"\r
                                 ObjectFile="vc_mswud\fractal\"\r
                                 ProgramDataBaseFileName="vc_mswud\fractal.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\fractal.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\fractal.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\fractal.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\fractal.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -780,21 +784,23 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         >\r
                         <File\r
                                 RelativePath=".\fractal.cpp"\r
                         >\r
                         <File\r
                                 RelativePath=".\fractal.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         >\r
                         <File\r
                                 RelativePath=".\fractal.rc"\r
                         >\r
                         <File\r
                                 RelativePath=".\fractal.rc"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/demos/fractal/makefile.bcc b/demos/fractal/makefile.bcc

index 6b21778c54b751608019c59dfc845b2b22ea41e9..973c6f91adea1c08be27bc842ca3d966f1769922 100644 (file)
--- a/demos/fractal/makefile.bcc
+++ b/demos/fractal/makefile.bcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -229,7 +229,7 @@ clean:
         -if exist $(OBJS)\fractal.ils del $(OBJS)\fractal.ils
  
  $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS)  $(OBJS)\fractal_fractal.res
         -if exist $(OBJS)\fractal.ils del $(OBJS)\fractal.ils
  
  $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS)  $(OBJS)\fractal_fractal.res
-       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
         c0w32.obj $(FRACTAL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\fractal_fractal.res
  |
  
         c0w32.obj $(FRACTAL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\fractal_fractal.res
  |
  
diff --git a/demos/fractal/makefile.gcc b/demos/fractal/makefile.gcc

index 185af559b28ca1d48cd46ec28bd6f5e272ccdd43..4ec493a2850a7baf1033d312886c7f7765b97cbe 100644 (file)
--- a/demos/fractal/makefile.gcc
+++ b/demos/fractal/makefile.gcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
  
  ### Variables: ###
  
  
  ### Variables: ###
  
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
@@ -224,7 +224,7 @@ clean:
         -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe
  
  $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal_rc.o
         -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe
  
  $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal_rc.o
-       $(CXX) -o $@ $(FRACTAL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(FRACTAL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
  
  $(OBJS)\fractal_fractal.o: ./fractal.cpp
         $(CXX) -c -o $@ $(FRACTAL_CXXFLAGS) $(CPPDEPS) $<
  
  $(OBJS)\fractal_fractal.o: ./fractal.cpp
         $(CXX) -c -o $@ $(FRACTAL_CXXFLAGS) $(CPPDEPS) $<
diff --git a/demos/fractal/makefile.vc b/demos/fractal/makefile.vc

index 4a05909b031b39e7366d4fdd7d2ac8aa280b9802..a16e28c8c96c3b5993eeab97f4a8908d59e99744 100644 (file)
--- a/demos/fractal/makefile.vc
+++ b/demos/fractal/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  DIR_SUFFIX_CPU = _amd64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
@@ -305,7 +305,7 @@ clean:
         -if exist $(OBJS)\fractal.pdb del $(OBJS)\fractal.pdb
  
  $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res
         -if exist $(OBJS)\fractal.pdb del $(OBJS)\fractal.pdb
  
  $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
         $(FRACTAL_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
         $(FRACTAL_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
diff --git a/demos/fractal/makefile.wat b/demos/fractal/makefile.wat

index 37012cccdb576e2f7c0d7f21c3daf4ebd4397ee9..9d3de98b184f176bc6f434603122998afe91cd0c 100644 (file)
--- a/demos/fractal/makefile.wat
+++ b/demos/fractal/makefile.wat
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -251,7 +251,7 @@ $(OBJS)\fractal.exe :  $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res
         @%append $(OBJS)\fractal.lbc option quiet
         @%append $(OBJS)\fractal.lbc name $^@
         @%append $(OBJS)\fractal.lbc option caseexact
         @%append $(OBJS)\fractal.lbc option quiet
         @%append $(OBJS)\fractal.lbc name $^@
         @%append $(OBJS)\fractal.lbc option caseexact
-       @%append $(OBJS)\fractal.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\fractal.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
         @for %i in ($(FRACTAL_OBJECTS)) do @%append $(OBJS)\fractal.lbc file %i
         @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\fractal.lbc library %i
         @%append $(OBJS)\fractal.lbc option resource=$(OBJS)\fractal_fractal.res
         @for %i in ($(FRACTAL_OBJECTS)) do @%append $(OBJS)\fractal.lbc file %i
         @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\fractal.lbc library %i
         @%append $(OBJS)\fractal.lbc option resource=$(OBJS)\fractal_fractal.res
diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in

index a505559d2f0e191719ad5f670318af4c05800a57..c0e4973a75a1b05edaa3d75b8c8657f8b3fb3a7b 100644 (file)
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -62,7 +62,7 @@ LIFE_OBJECTS =  \
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
@@ -113,28 +113,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  
  ### Targets: ###
  
  all: life$(EXEEXT) $(__life_bundle___depname) data
  
  
  ### Targets: ###
  
  all: life$(EXEEXT) $(__life_bundle___depname) data
  
-install: all
+install: 
  
  uninstall: 
  
  
  uninstall: 
  
@@ -150,7 +150,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc)
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc)
-       $(CXX) -o $@ $(LIFE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(LIFE_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
         
         $(__life___mac_setfilecmd)
         $(__life___os2_emxbindcmd)
         
         $(__life___mac_setfilecmd)
         $(__life___os2_emxbindcmd)
@@ -216,6 +216,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
  
  .PHONY: all install uninstall clean distclean life_bundle data
  
  .PHONY: all install uninstall clean distclean life_bundle data
diff --git a/demos/life/life_vc7.vcproj b/demos/life/life_vc7.vcproj

index 438e25f92b856e06799ca3cae7d38b268279409c..85b31d959addfed1a1bbffde60498294a415c00c 100644 (file)
--- a/demos/life/life_vc7.vcproj
+++ b/demos/life/life_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -22,74 +22,60 @@
                         IntermediateDirectory="vc_mswunivudll\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivudll\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivudll\life\"\r
                                 ObjectFile="vc_mswunivudll\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\life.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivudll\life\"\r
                                 ObjectFile="vc_mswunivudll\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\life.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivudll\life.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivudll\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\life_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
@@ -97,74 +83,63 @@
                         IntermediateDirectory="vc_mswunivuddll\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivuddll\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivuddll\life\"\r
                                 ObjectFile="vc_mswunivuddll\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\life.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivuddll\life\"\r
                                 ObjectFile="vc_mswunivuddll\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\life.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\life.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\life_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
@@ -172,74 +147,60 @@
                         IntermediateDirectory="vc_mswudll\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswudll\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswudll\life\"\r
                                 ObjectFile="vc_mswudll\life\"\r
                                 ProgramDataBaseFileName="vc_mswudll\life.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswudll\life\"\r
                                 ObjectFile="vc_mswudll\life\"\r
                                 ProgramDataBaseFileName="vc_mswudll\life.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswudll\life.pdb"\r
                                 ProgramDatabaseFile="vc_mswudll\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\life_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
@@ -247,74 +208,63 @@
                         IntermediateDirectory="vc_mswuddll\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswuddll\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswuddll\life\"\r
                                 ObjectFile="vc_mswuddll\life\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\life.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswuddll\life\"\r
                                 ObjectFile="vc_mswuddll\life\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\life.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswuddll\life.pdb"\r
                                 ProgramDatabaseFile="vc_mswuddll\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\life_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
@@ -322,74 +272,60 @@
                         IntermediateDirectory="vc_mswunivu\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivu\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivu\life\"\r
                                 ObjectFile="vc_mswunivu\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\life.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivu\life\"\r
                                 ObjectFile="vc_mswunivu\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\life.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivu\life.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivu\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\life_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
@@ -397,74 +333,63 @@
                         IntermediateDirectory="vc_mswunivud\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivud\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivud\life\"\r
                                 ObjectFile="vc_mswunivud\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\life.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivud\life\"\r
                                 ObjectFile="vc_mswunivud\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\life.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivud\life.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivud\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\life_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
@@ -472,74 +397,60 @@
                         IntermediateDirectory="vc_mswu\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswu\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswu\life\"\r
                                 ObjectFile="vc_mswu\life\"\r
                                 ProgramDataBaseFileName="vc_mswu\life.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswu\life\"\r
                                 ObjectFile="vc_mswu\life\"\r
                                 ProgramDataBaseFileName="vc_mswu\life.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswu\life.pdb"\r
                                 ProgramDatabaseFile="vc_mswu\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\life_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
@@ -547,74 +458,63 @@
                         IntermediateDirectory="vc_mswud\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswud\life"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswud\life\"\r
                                 ObjectFile="vc_mswud\life\"\r
                                 ProgramDataBaseFileName="vc_mswud\life.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswud\life\"\r
                                 ObjectFile="vc_mswud\life\"\r
                                 ProgramDataBaseFileName="vc_mswud\life.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswud\life.pdb"\r
                                 ProgramDatabaseFile="vc_mswud\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\life_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
@@ -623,23 +523,28 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\dialogs.cpp"/>\r
+                               RelativePath=".\dialogs.cpp">\r
+                       </File>\r
                         <File\r
                         <File\r
-                               RelativePath=".\game.cpp"/>\r
+                               RelativePath=".\game.cpp">\r
+                       </File>\r
                         <File\r
                         <File\r
-                               RelativePath=".\life.cpp"/>\r
+                               RelativePath=".\life.cpp">\r
+                       </File>\r
                         <File\r
                         <File\r
-                               RelativePath=".\reader.cpp"/>\r
+                               RelativePath=".\reader.cpp">\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\life.rc"/>\r
+                               RelativePath=".\life.rc">\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/demos/life/life_vc8.vcproj b/demos/life/life_vc8.vcproj

index c7da5632366c9ff165e269391c0d3d79335a28df..6f1d019698a163f17cc3758512d90b0a3a2402da 100644 (file)
--- a/demos/life/life_vc8.vcproj
+++ b/demos/life/life_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -43,57 +43,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\life\"\r
                                 ObjectFile="vc_mswunivudll\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\life\"\r
                                 ObjectFile="vc_mswunivudll\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\life.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -137,57 +136,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\life\"\r
                                 ObjectFile="vc_mswunivuddll\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\life\"\r
                                 ObjectFile="vc_mswunivuddll\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\life.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -231,57 +232,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\life\"\r
                                 ObjectFile="vc_mswudll\life\"\r
                                 ProgramDataBaseFileName="vc_mswudll\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\life\"\r
                                 ObjectFile="vc_mswudll\life\"\r
                                 ProgramDataBaseFileName="vc_mswudll\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\life.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -325,57 +325,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\life\"\r
                                 ObjectFile="vc_mswuddll\life\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\life\"\r
                                 ObjectFile="vc_mswuddll\life\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\life.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -419,57 +421,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\life\"\r
                                 ObjectFile="vc_mswunivu\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\life\"\r
                                 ObjectFile="vc_mswunivu\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\life.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -513,57 +514,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\life\"\r
                                 ObjectFile="vc_mswunivud\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\life\"\r
                                 ObjectFile="vc_mswunivud\life\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\life.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -607,57 +610,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\life\"\r
                                 ObjectFile="vc_mswu\life\"\r
                                 ProgramDataBaseFileName="vc_mswu\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\life\"\r
                                 ObjectFile="vc_mswu\life\"\r
                                 ProgramDataBaseFileName="vc_mswu\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\life.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -701,57 +703,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\life\"\r
                                 ObjectFile="vc_mswud\life\"\r
                                 ProgramDataBaseFileName="vc_mswud\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\life\"\r
                                 ObjectFile="vc_mswud\life\"\r
                                 ProgramDataBaseFileName="vc_mswud\life.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\life.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\life.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\life.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\life.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -780,30 +784,35 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         >\r
                         <File\r
                                 RelativePath=".\dialogs.cpp"\r
                         >\r
                         <File\r
                                 RelativePath=".\dialogs.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\game.cpp"\r
                         <File\r
                                 RelativePath=".\game.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\life.cpp"\r
                         <File\r
                                 RelativePath=".\life.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\reader.cpp"\r
                         <File\r
                                 RelativePath=".\reader.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         >\r
                         <File\r
                                 RelativePath=".\life.rc"\r
                         >\r
                         <File\r
                                 RelativePath=".\life.rc"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/demos/life/makefile.bcc b/demos/life/makefile.bcc

index 471e873881be9e6457374822dfd1af2de1ad0bde..9bef3a2f4514424642ab13080095fc2392b297eb 100644 (file)
--- a/demos/life/makefile.bcc
+++ b/demos/life/makefile.bcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -232,7 +232,7 @@ clean:
         -if exist $(OBJS)\life.ils del $(OBJS)\life.ils
  
  $(OBJS)\life.exe: $(LIFE_OBJECTS)  $(OBJS)\life_life.res
         -if exist $(OBJS)\life.ils del $(OBJS)\life.ils
  
  $(OBJS)\life.exe: $(LIFE_OBJECTS)  $(OBJS)\life_life.res
-       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
         c0w32.obj $(LIFE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\life_life.res
  |
  
         c0w32.obj $(LIFE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\life_life.res
  |
  
diff --git a/demos/life/makefile.gcc b/demos/life/makefile.gcc

index cc796d559788fc576713c774a00ea97b69193e64..2a993168aa6d31c0cef4b130124a8122758313a7 100644 (file)
--- a/demos/life/makefile.gcc
+++ b/demos/life/makefile.gcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
  
  ### Variables: ###
  
  
  ### Variables: ###
  
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
@@ -227,7 +227,7 @@ clean:
         -if exist $(OBJS)\life.exe del $(OBJS)\life.exe
  
  $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life_rc.o
         -if exist $(OBJS)\life.exe del $(OBJS)\life.exe
  
  $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life_rc.o
-       $(CXX) -o $@ $(LIFE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(LIFE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
  
  data: 
         if not exist $(OBJS) mkdir $(OBJS)
  
  data: 
         if not exist $(OBJS) mkdir $(OBJS)
diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc

index 28c427dde4c2416d92284fb159541fd5fb9324d9..db745ffa05e8e0ca9148ea4c7f37d5bde1c924b7 100644 (file)
--- a/demos/life/makefile.vc
+++ b/demos/life/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -55,18 +55,18 @@ WXUNICODEFLAG = u
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  DIR_SUFFIX_CPU = _amd64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
@@ -76,18 +76,18 @@ LIBTYPE_SUFFIX = lib
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
@@ -308,7 +308,7 @@ clean:
         -if exist $(OBJS)\life.pdb del $(OBJS)\life.pdb
  
  $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res
         -if exist $(OBJS)\life.pdb del $(OBJS)\life.pdb
  
  $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
         $(LIFE_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
         $(LIFE_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
diff --git a/demos/life/makefile.wat b/demos/life/makefile.wat

index eb99c4259ba070b1230d252310f6b48fa2c72a7e..77230873146bfc7c71ac3ebd279867ee4a296c5a 100644 (file)
--- a/demos/life/makefile.wat
+++ b/demos/life/makefile.wat
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -254,7 +254,7 @@ $(OBJS)\life.exe :  $(LIFE_OBJECTS) $(OBJS)\life_life.res
         @%append $(OBJS)\life.lbc option quiet
         @%append $(OBJS)\life.lbc name $^@
         @%append $(OBJS)\life.lbc option caseexact
         @%append $(OBJS)\life.lbc option quiet
         @%append $(OBJS)\life.lbc name $^@
         @%append $(OBJS)\life.lbc option caseexact
-       @%append $(OBJS)\life.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\life.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
         @for %i in ($(LIFE_OBJECTS)) do @%append $(OBJS)\life.lbc file %i
         @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\life.lbc library %i
         @%append $(OBJS)\life.lbc option resource=$(OBJS)\life_life.res
         @for %i in ($(LIFE_OBJECTS)) do @%append $(OBJS)\life.lbc file %i
         @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\life.lbc library %i
         @%append $(OBJS)\life.lbc option resource=$(OBJS)\life_life.res
diff --git a/demos/makefile.bcc b/demos/makefile.bcc

index ac1204e5fdc22aea44b30a9ad2abb662ef262da6..bdfcd0d229907b95a01e14f96c7eecf60a09cbc4 100644 (file)
--- a/demos/makefile.bcc
+++ b/demos/makefile.bcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -28,8 +28,9 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
         -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
         -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
         -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
         -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
         -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
         -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
-       -DUSE_AUI="$(USE_AUI)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
-       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
+       -DUSE_AUI="$(USE_AUI)" -DUSE_PROPGRID="$(USE_PROPGRID)" \
+       -DUSE_RICHTEXT="$(USE_RICHTEXT)" -DUSE_STC="$(USE_STC)" \
+       -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
         -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
         -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \
         -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
         -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
         -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \
         -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
diff --git a/demos/makefile.gcc b/demos/makefile.gcc

index a771269649dc605142f0cf5d4528d21a219371f6..fec06fa0144dac0dcb34288f1f9fd11ef8fc728e 100644 (file)
--- a/demos/makefile.gcc
+++ b/demos/makefile.gcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -20,8 +20,8 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
         DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
         MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
         USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
         DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
         MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
         USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \
+       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
         USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
         USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
         OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
         USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
         USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
         OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
diff --git a/demos/makefile.vc b/demos/makefile.vc

index b8341f7221339081613b008497de444d48b68426..98667fc5b559b973a8d643f5f59335bca9b64033 100644 (file)
--- a/demos/makefile.vc
+++ b/demos/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -19,8 +19,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
         DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
         MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
         USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
         DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
         MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
         USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \
+       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
         USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
         USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
         OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
         USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
         USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
         OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
diff --git a/demos/makefile.wat b/demos/makefile.wat

index d2151e2d6dd21540c044862cb071dadaca506a29..e8c44b05900e673a7372570574a07a4c3a0e0bc0 100644 (file)
--- a/demos/makefile.wat
+++ b/demos/makefile.wat
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -36,8 +36,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
         DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
         MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
         USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
         DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
         MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
         USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" &
+       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
         USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
         USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
         OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
         USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
         USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
         OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in

index cdbbc272cbcd4b0f3df48ec99328cd4c33b5b815..220f1d6045d9f059f22d31af69a14bc3c2e41749 100644 (file)
--- a/demos/poem/Makefile.in
+++ b/demos/poem/Makefile.in
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -60,7 +60,7 @@ WXPOEM_OBJECTS =  \
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
@@ -114,28 +114,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  
  ### Targets: ###
  
  all: wxpoem$(EXEEXT) $(__wxpoem_bundle___depname) data
  
  
  ### Targets: ###
  
  all: wxpoem$(EXEEXT) $(__wxpoem_bundle___depname) data
  
-install: all
+install: 
  
  uninstall: 
  
  
  uninstall: 
  
@@ -151,7 +151,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc)
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc)
-       $(CXX) -o $@ $(WXPOEM_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(WXPOEM_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
         
         $(__wxpoem___mac_setfilecmd)
         $(__wxpoem___os2_emxbindcmd)
         
         $(__wxpoem___mac_setfilecmd)
         $(__wxpoem___os2_emxbindcmd)
@@ -208,6 +208,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
  
  .PHONY: all install uninstall clean distclean wxpoem_bundle data
  
  .PHONY: all install uninstall clean distclean wxpoem_bundle data
diff --git a/demos/poem/makefile.bcc b/demos/poem/makefile.bcc

index 9a9cf65d7257c2db1a9316d4c64d4c1ade087803..e6877a44336788bc6b662e1f757c485464ecba73 100644 (file)
--- a/demos/poem/makefile.bcc
+++ b/demos/poem/makefile.bcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -233,7 +233,7 @@ clean:
         -if exist $(OBJS)\wxpoem.ils del $(OBJS)\wxpoem.ils
  
  $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS)  $(OBJS)\wxpoem_wxpoem.res
         -if exist $(OBJS)\wxpoem.ils del $(OBJS)\wxpoem.ils
  
  $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS)  $(OBJS)\wxpoem_wxpoem.res
-       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
         c0w32.obj $(WXPOEM_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxpoem_wxpoem.res
  |
  
         c0w32.obj $(WXPOEM_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxpoem_wxpoem.res
  |
  
diff --git a/demos/poem/makefile.gcc b/demos/poem/makefile.gcc

index aa9ac2b36b1f58646556c203f0084452ed861f63..56809f278bdca886de664593212b8935571d4df7 100644 (file)
--- a/demos/poem/makefile.gcc
+++ b/demos/poem/makefile.gcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
  
  ### Variables: ###
  
  
  ### Variables: ###
  
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
@@ -228,7 +228,7 @@ clean:
         -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe
  
  $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem_rc.o
         -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe
  
  $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem_rc.o
-       $(CXX) -o $@ $(WXPOEM_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(WXPOEM_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
  
  data: 
         if not exist $(OBJS) mkdir $(OBJS)
  
  data: 
         if not exist $(OBJS) mkdir $(OBJS)
diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc

index 7bf3925f547338e0a5a11910ffd27f3ee99e493b..7bc638fd6aa3859fdf2fa830947b51bae3589341 100644 (file)
--- a/demos/poem/makefile.vc
+++ b/demos/poem/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  DIR_SUFFIX_CPU = _amd64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
@@ -309,7 +309,7 @@ clean:
         -if exist $(OBJS)\wxpoem.pdb del $(OBJS)\wxpoem.pdb
  
  $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res
         -if exist $(OBJS)\wxpoem.pdb del $(OBJS)\wxpoem.pdb
  
  $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
         $(WXPOEM_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
         $(WXPOEM_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
diff --git a/demos/poem/makefile.wat b/demos/poem/makefile.wat

index 50e4cf3e4c531b5cba88bd5b0b9f73605f37487e..5a6f72404e687beafb38c7acfec9623c06135e21 100644 (file)
--- a/demos/poem/makefile.wat
+++ b/demos/poem/makefile.wat
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -256,7 +256,7 @@ $(OBJS)\wxpoem.exe :  $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res
         @%append $(OBJS)\wxpoem.lbc option quiet
         @%append $(OBJS)\wxpoem.lbc name $^@
         @%append $(OBJS)\wxpoem.lbc option caseexact
         @%append $(OBJS)\wxpoem.lbc option quiet
         @%append $(OBJS)\wxpoem.lbc name $^@
         @%append $(OBJS)\wxpoem.lbc option caseexact
-       @%append $(OBJS)\wxpoem.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\wxpoem.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
         @for %i in ($(WXPOEM_OBJECTS)) do @%append $(OBJS)\wxpoem.lbc file %i
         @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\wxpoem.lbc library %i
         @%append $(OBJS)\wxpoem.lbc option resource=$(OBJS)\wxpoem_wxpoem.res
         @for %i in ($(WXPOEM_OBJECTS)) do @%append $(OBJS)\wxpoem.lbc file %i
         @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\wxpoem.lbc library %i
         @%append $(OBJS)\wxpoem.lbc option resource=$(OBJS)\wxpoem_wxpoem.res
diff --git a/demos/poem/poem_vc7.vcproj b/demos/poem/poem_vc7.vcproj

index d6f82b7cd058be8d3fc12d9ebad95756312e9698..576fad4165540a3448cdeb6cadd540b96ffa814d 100644 (file)
--- a/demos/poem/poem_vc7.vcproj
+++ b/demos/poem/poem_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -22,74 +22,60 @@
                         IntermediateDirectory="vc_mswunivudll\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivudll\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivudll\wxpoem\"\r
                                 ObjectFile="vc_mswunivudll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivudll\wxpoem\"\r
                                 ObjectFile="vc_mswunivudll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivudll\wxpoem.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivudll\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\poem_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
@@ -97,74 +83,63 @@
                         IntermediateDirectory="vc_mswunivuddll\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivuddll\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivuddll\wxpoem\"\r
                                 ObjectFile="vc_mswunivuddll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivuddll\wxpoem\"\r
                                 ObjectFile="vc_mswunivuddll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\wxpoem.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\poem_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
@@ -172,74 +147,60 @@
                         IntermediateDirectory="vc_mswudll\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswudll\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswudll\wxpoem\"\r
                                 ObjectFile="vc_mswudll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswudll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswudll\wxpoem\"\r
                                 ObjectFile="vc_mswudll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswudll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswudll\wxpoem.pdb"\r
                                 ProgramDatabaseFile="vc_mswudll\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\poem_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
@@ -247,74 +208,63 @@
                         IntermediateDirectory="vc_mswuddll\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswuddll\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswuddll\wxpoem\"\r
                                 ObjectFile="vc_mswuddll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswuddll\wxpoem\"\r
                                 ObjectFile="vc_mswuddll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswuddll\wxpoem.pdb"\r
                                 ProgramDatabaseFile="vc_mswuddll\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\poem_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
@@ -322,74 +272,60 @@
                         IntermediateDirectory="vc_mswunivu\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivu\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivu\wxpoem\"\r
                                 ObjectFile="vc_mswunivu\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivu\wxpoem\"\r
                                 ObjectFile="vc_mswunivu\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\wxpoem.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivu\wxpoem.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivu\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\poem_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
@@ -397,74 +333,63 @@
                         IntermediateDirectory="vc_mswunivud\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivud\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivud\wxpoem\"\r
                                 ObjectFile="vc_mswunivud\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivud\wxpoem\"\r
                                 ObjectFile="vc_mswunivud\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\wxpoem.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivud\wxpoem.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivud\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\poem_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
@@ -472,74 +397,60 @@
                         IntermediateDirectory="vc_mswu\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswu\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswu\wxpoem\"\r
                                 ObjectFile="vc_mswu\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswu\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswu\wxpoem\"\r
                                 ObjectFile="vc_mswu\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswu\wxpoem.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswu\wxpoem.pdb"\r
                                 ProgramDatabaseFile="vc_mswu\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\poem_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
@@ -547,74 +458,63 @@
                         IntermediateDirectory="vc_mswud\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswud\wxpoem"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswud\wxpoem\"\r
                                 ObjectFile="vc_mswud\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswud\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswud\wxpoem\"\r
                                 ObjectFile="vc_mswud\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswud\wxpoem.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswud\wxpoem.pdb"\r
                                 ProgramDatabaseFile="vc_mswud\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\poem_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
@@ -623,17 +523,19 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\wxpoem.cpp"/>\r
+                               RelativePath=".\wxpoem.cpp">\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\wxpoem.rc"/>\r
+                               RelativePath=".\wxpoem.rc">\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/demos/poem/poem_vc8.vcproj b/demos/poem/poem_vc8.vcproj

index 66936e8a70431f66060316c64c872c25aada2d2d..9bf48852d89f79d88c5911157209639197a3e400 100644 (file)
--- a/demos/poem/poem_vc8.vcproj
+++ b/demos/poem/poem_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -43,57 +43,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\wxpoem\"\r
                                 ObjectFile="vc_mswunivudll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\wxpoem\"\r
                                 ObjectFile="vc_mswunivudll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\wxpoem.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -137,57 +136,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\wxpoem\"\r
                                 ObjectFile="vc_mswunivuddll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\wxpoem\"\r
                                 ObjectFile="vc_mswunivuddll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\wxpoem.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -231,57 +232,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\wxpoem\"\r
                                 ObjectFile="vc_mswudll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswudll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\wxpoem\"\r
                                 ObjectFile="vc_mswudll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswudll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\wxpoem.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -325,57 +325,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\wxpoem\"\r
                                 ObjectFile="vc_mswuddll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\wxpoem\"\r
                                 ObjectFile="vc_mswuddll\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\wxpoem.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -419,57 +421,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\wxpoem\"\r
                                 ObjectFile="vc_mswunivu\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\wxpoem\"\r
                                 ObjectFile="vc_mswunivu\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\wxpoem.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -513,57 +514,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\wxpoem\"\r
                                 ObjectFile="vc_mswunivud\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\wxpoem\"\r
                                 ObjectFile="vc_mswunivud\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\wxpoem.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -607,57 +610,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\wxpoem\"\r
                                 ObjectFile="vc_mswu\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswu\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\wxpoem\"\r
                                 ObjectFile="vc_mswu\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswu\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\wxpoem.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -701,57 +703,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\wxpoem\"\r
                                 ObjectFile="vc_mswud\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswud\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\wxpoem\"\r
                                 ObjectFile="vc_mswud\wxpoem\"\r
                                 ProgramDataBaseFileName="vc_mswud\wxpoem.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\wxpoem.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\wxpoem.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\wxpoem.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\wxpoem.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -780,21 +784,23 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         >\r
                         <File\r
                                 RelativePath=".\wxpoem.cpp"\r
                         >\r
                         <File\r
                                 RelativePath=".\wxpoem.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         >\r
                         <File\r
                                 RelativePath=".\wxpoem.rc"\r
                         >\r
                         <File\r
                                 RelativePath=".\wxpoem.rc"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/utils/emulator/src/Makefile.in b/utils/emulator/src/Makefile.in

index 6d96a3859f2451966918a7693bd88c6da2d3da45..9ae7b3f559b1bd63b3dd2c00c351e5550fdb615f 100644 (file)
--- a/utils/emulator/src/Makefile.in
+++ b/utils/emulator/src/Makefile.in
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -56,7 +56,7 @@ WXEMULATOR_OBJECTS =  \
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
@@ -94,28 +94,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  
  ### Targets: ###
  
  all: wxemulator$(EXEEXT) data
  
  
  ### Targets: ###
  
  all: wxemulator$(EXEEXT) data
  
-install: all
+install: 
  
  uninstall: 
  
  
  uninstall: 
  
@@ -130,7 +130,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxemulator$(EXEEXT): $(WXEMULATOR_OBJECTS) $(__wxemulator___win32rc)
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxemulator$(EXEEXT): $(WXEMULATOR_OBJECTS) $(__wxemulator___win32rc)
-       $(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(WXEMULATOR_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
         
         $(__wxemulator___mac_setfilecmd)
         $(__wxemulator___os2_emxbindcmd)
         
         $(__wxemulator___mac_setfilecmd)
         $(__wxemulator___os2_emxbindcmd)
@@ -164,6 +164,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
  
  .PHONY: all install uninstall clean distclean data
  
  .PHONY: all install uninstall clean distclean data
diff --git a/utils/emulator/src/emulator_vc7.vcproj b/utils/emulator/src/emulator_vc7.vcproj

index 89013183f9f925671e1b936cb88135fa0616a77e..0ed8af58b47c2f1ae6c4c1791a032af263acfff2 100644 (file)
--- a/utils/emulator/src/emulator_vc7.vcproj
+++ b/utils/emulator/src/emulator_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -22,74 +22,60 @@
                         IntermediateDirectory="vc_mswunivudll\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivudll\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivudll\wxemulator\"\r
                                 ObjectFile="vc_mswunivudll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivudll\wxemulator\"\r
                                 ObjectFile="vc_mswunivudll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivudll\wxemulator.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivudll\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\emulator_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
@@ -97,74 +83,63 @@
                         IntermediateDirectory="vc_mswunivuddll\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivuddll\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivuddll\wxemulator\"\r
                                 ObjectFile="vc_mswunivuddll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivuddll\wxemulator\"\r
                                 ObjectFile="vc_mswunivuddll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\wxemulator.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\emulator_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
@@ -172,74 +147,60 @@
                         IntermediateDirectory="vc_mswudll\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswudll\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswudll\wxemulator\"\r
                                 ObjectFile="vc_mswudll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswudll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswudll\wxemulator\"\r
                                 ObjectFile="vc_mswudll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswudll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswudll\wxemulator.pdb"\r
                                 ProgramDatabaseFile="vc_mswudll\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\emulator_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
@@ -247,74 +208,63 @@
                         IntermediateDirectory="vc_mswuddll\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswuddll\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswuddll\wxemulator\"\r
                                 ObjectFile="vc_mswuddll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswuddll\wxemulator\"\r
                                 ObjectFile="vc_mswuddll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswuddll\wxemulator.pdb"\r
                                 ProgramDatabaseFile="vc_mswuddll\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\emulator_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
@@ -322,74 +272,60 @@
                         IntermediateDirectory="vc_mswunivu\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivu\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivu\wxemulator\"\r
                                 ObjectFile="vc_mswunivu\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivu\wxemulator\"\r
                                 ObjectFile="vc_mswunivu\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\wxemulator.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivu\wxemulator.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivu\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\emulator_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
@@ -397,74 +333,63 @@
                         IntermediateDirectory="vc_mswunivud\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivud\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivud\wxemulator\"\r
                                 ObjectFile="vc_mswunivud\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivud\wxemulator\"\r
                                 ObjectFile="vc_mswunivud\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\wxemulator.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivud\wxemulator.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivud\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\emulator_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
@@ -472,74 +397,60 @@
                         IntermediateDirectory="vc_mswu\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswu\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswu\wxemulator\"\r
                                 ObjectFile="vc_mswu\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswu\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswu\wxemulator\"\r
                                 ObjectFile="vc_mswu\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswu\wxemulator.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswu\wxemulator.pdb"\r
                                 ProgramDatabaseFile="vc_mswu\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\emulator_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
@@ -547,74 +458,63 @@
                         IntermediateDirectory="vc_mswud\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswud\wxemulator"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswud\wxemulator\"\r
                                 ObjectFile="vc_mswud\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswud\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswud\wxemulator\"\r
                                 ObjectFile="vc_mswud\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswud\wxemulator.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswud\wxemulator.pdb"\r
                                 ProgramDatabaseFile="vc_mswud\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\emulator_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
@@ -623,17 +523,19 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\emulator.cpp"/>\r
+                               RelativePath=".\emulator.cpp">\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\..\..\..\samples\sample.rc"/>\r
+                               RelativePath=".\..\..\..\samples\sample.rc">\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/utils/emulator/src/emulator_vc8.vcproj b/utils/emulator/src/emulator_vc8.vcproj

index 866e9ca544d901ccb0c1ea7730413e413c162343..399ed708ea19f082d0ab393367ce7563b5eb4138 100644 (file)
--- a/utils/emulator/src/emulator_vc8.vcproj
+++ b/utils/emulator/src/emulator_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -43,57 +43,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\wxemulator\"\r
                                 ObjectFile="vc_mswunivudll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\wxemulator\"\r
                                 ObjectFile="vc_mswunivudll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\wxemulator.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -137,57 +136,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\wxemulator\"\r
                                 ObjectFile="vc_mswunivuddll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\wxemulator\"\r
                                 ObjectFile="vc_mswunivuddll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\wxemulator.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -231,57 +232,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\wxemulator\"\r
                                 ObjectFile="vc_mswudll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswudll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\wxemulator\"\r
                                 ObjectFile="vc_mswudll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswudll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\wxemulator.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -325,57 +325,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\wxemulator\"\r
                                 ObjectFile="vc_mswuddll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\wxemulator\"\r
                                 ObjectFile="vc_mswuddll\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\wxemulator.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -419,57 +421,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\wxemulator\"\r
                                 ObjectFile="vc_mswunivu\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\wxemulator\"\r
                                 ObjectFile="vc_mswunivu\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\wxemulator.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -513,57 +514,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\wxemulator\"\r
                                 ObjectFile="vc_mswunivud\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\wxemulator\"\r
                                 ObjectFile="vc_mswunivud\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\wxemulator.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -607,57 +610,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\wxemulator\"\r
                                 ObjectFile="vc_mswu\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswu\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\wxemulator\"\r
                                 ObjectFile="vc_mswu\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswu\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\wxemulator.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -701,57 +703,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\wxemulator\"\r
                                 ObjectFile="vc_mswud\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswud\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\wxemulator\"\r
                                 ObjectFile="vc_mswud\wxemulator\"\r
                                 ProgramDataBaseFileName="vc_mswud\wxemulator.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\wxemulator.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\wxemulator.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\wxemulator.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\wxemulator.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -780,21 +784,23 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         >\r
                         <File\r
                                 RelativePath=".\emulator.cpp"\r
                         >\r
                         <File\r
                                 RelativePath=".\emulator.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         >\r
                         <File\r
                                 RelativePath=".\..\..\..\samples\sample.rc"\r
                         >\r
                         <File\r
                                 RelativePath=".\..\..\..\samples\sample.rc"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/utils/emulator/src/makefile.bcc b/utils/emulator/src/makefile.bcc

index 3800a323603de76da2fd41c489832a8fe3bcd9ac..569fa6edcbf36799a2629262df49029de8aa3f80 100644 (file)
--- a/utils/emulator/src/makefile.bcc
+++ b/utils/emulator/src/makefile.bcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -229,7 +229,7 @@ clean:
         -if exist $(OBJS)\wxemulator.ils del $(OBJS)\wxemulator.ils
  
  $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS)  $(OBJS)\wxemulator_sample.res
         -if exist $(OBJS)\wxemulator.ils del $(OBJS)\wxemulator.ils
  
  $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS)  $(OBJS)\wxemulator_sample.res
-       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
         c0w32.obj $(WXEMULATOR_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxemulator_sample.res
  |
  
         c0w32.obj $(WXEMULATOR_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxemulator_sample.res
  |
  
diff --git a/utils/emulator/src/makefile.gcc b/utils/emulator/src/makefile.gcc

index f2cfeb308c0061491d119fe03876f100a0855fa4..1f5c5dc1025593f0fc4a8d3e98b256723e720185 100644 (file)
--- a/utils/emulator/src/makefile.gcc
+++ b/utils/emulator/src/makefile.gcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
  
  ### Variables: ###
  
  
  ### Variables: ###
  
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
@@ -224,7 +224,7 @@ clean:
         -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe
  
  $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample_rc.o
         -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe
  
  $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample_rc.o
-       $(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(WXEMULATOR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
  
  data: 
         if not exist $(OBJS) mkdir $(OBJS)
  
  data: 
         if not exist $(OBJS) mkdir $(OBJS)
diff --git a/utils/emulator/src/makefile.vc b/utils/emulator/src/makefile.vc

index 8a8084329bcb73eae85a1d24c061c19927fb0eda..c1f18ec48cff9edc0058b087c496b16227a3dc59 100644 (file)
--- a/utils/emulator/src/makefile.vc
+++ b/utils/emulator/src/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  DIR_SUFFIX_CPU = _amd64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
@@ -305,7 +305,7 @@ clean:
         -if exist $(OBJS)\wxemulator.pdb del $(OBJS)\wxemulator.pdb
  
  $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res
         -if exist $(OBJS)\wxemulator.pdb del $(OBJS)\wxemulator.pdb
  
  $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxemulator.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxemulator.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
         $(WXEMULATOR_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
         $(WXEMULATOR_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
diff --git a/utils/emulator/src/makefile.wat b/utils/emulator/src/makefile.wat

index 5ca3799d6f5f6de53277c87812cd13d1b00a0902..b1567e1b194374011410974424c7040703d08633 100644 (file)
--- a/utils/emulator/src/makefile.wat
+++ b/utils/emulator/src/makefile.wat
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -251,7 +251,7 @@ $(OBJS)\wxemulator.exe :  $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res
         @%append $(OBJS)\wxemulator.lbc option quiet
         @%append $(OBJS)\wxemulator.lbc name $^@
         @%append $(OBJS)\wxemulator.lbc option caseexact
         @%append $(OBJS)\wxemulator.lbc option quiet
         @%append $(OBJS)\wxemulator.lbc name $^@
         @%append $(OBJS)\wxemulator.lbc option caseexact
-       @%append $(OBJS)\wxemulator.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\wxemulator.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
         @for %i in ($(WXEMULATOR_OBJECTS)) do @%append $(OBJS)\wxemulator.lbc file %i
         @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\wxemulator.lbc library %i
         @%append $(OBJS)\wxemulator.lbc option resource=$(OBJS)\wxemulator_sample.res
         @for %i in ($(WXEMULATOR_OBJECTS)) do @%append $(OBJS)\wxemulator.lbc file %i
         @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\wxemulator.lbc library %i
         @%append $(OBJS)\wxemulator.lbc option resource=$(OBJS)\wxemulator_sample.res
diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in

index 90730f232435803c8f54207089eeb39cf062633e..a274c9515f1cb836e63857d59dd661b0b1fad0bc 100644 (file)
--- a/utils/helpview/src/Makefile.in
+++ b/utils/helpview/src/Makefile.in
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -64,7 +64,7 @@ HELPVIEW_OBJECTS =  \
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
@@ -121,28 +121,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  
  ### Targets: ###
  
  all: helpview$(EXEEXT) $(__helpview_bundle___depname) data
  
  
  ### Targets: ###
  
  all: helpview$(EXEEXT) $(__helpview_bundle___depname) data
  
-install: all install_helpview
+install: install_helpview
  
  uninstall: uninstall_helpview
  
  
  uninstall: uninstall_helpview
  
@@ -159,7 +159,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
-       $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(HELPVIEW_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
         
         $(__helpview___mac_setfilecmd)
         $(__helpview___os2_emxbindcmd)
         
         $(__helpview___mac_setfilecmd)
         $(__helpview___os2_emxbindcmd)
@@ -187,7 +187,7 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
  
  @COND_PLATFORM_MACOSX_1@helpview_bundle: $(____helpview_BUNDLE_TGT_REF_DEP)
  
  
  @COND_PLATFORM_MACOSX_1@helpview_bundle: $(____helpview_BUNDLE_TGT_REF_DEP)
  
-install_helpview: 
+install_helpview: helpview$(EXEEXT)
         $(INSTALL_DIR) $(DESTDIR)$(bindir)
         $(INSTALL_PROGRAM) helpview$(EXEEXT) $(DESTDIR)$(bindir)
  
         $(INSTALL_DIR) $(DESTDIR)$(bindir)
         $(INSTALL_PROGRAM) helpview$(EXEEXT) $(DESTDIR)$(bindir)
  
@@ -223,6 +223,7 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
  
  
-.PHONY: all install uninstall clean distclean helpview_bundle install_helpview uninstall_helpview data
+.PHONY: all install uninstall clean distclean helpview_bundle install_helpview \
+       uninstall_helpview data
diff --git a/utils/helpview/src/helpview_vc7.vcproj b/utils/helpview/src/helpview_vc7.vcproj

index a1df24157f573364698e5e5764a89756c19de686..b802427d8580edba3a8c20ed2b95910147081d66 100644 (file)
--- a/utils/helpview/src/helpview_vc7.vcproj
+++ b/utils/helpview/src/helpview_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -22,74 +22,60 @@
                         IntermediateDirectory="vc_mswunivudll\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivudll\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivudll\helpview\"\r
                                 ObjectFile="vc_mswunivudll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivudll\helpview\"\r
                                 ObjectFile="vc_mswunivudll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\helpview.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivudll\helpview.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivudll\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\helpview_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
@@ -97,74 +83,63 @@
                         IntermediateDirectory="vc_mswunivuddll\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivuddll\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivuddll\helpview\"\r
                                 ObjectFile="vc_mswunivuddll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivuddll\helpview\"\r
                                 ObjectFile="vc_mswunivuddll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\helpview.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\helpview.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\helpview_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
@@ -172,74 +147,60 @@
                         IntermediateDirectory="vc_mswudll\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswudll\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswudll\helpview\"\r
                                 ObjectFile="vc_mswudll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswudll\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswudll\helpview\"\r
                                 ObjectFile="vc_mswudll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswudll\helpview.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswudll\helpview.pdb"\r
                                 ProgramDatabaseFile="vc_mswudll\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\helpview_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
@@ -247,74 +208,63 @@
                         IntermediateDirectory="vc_mswuddll\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswuddll\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswuddll\helpview\"\r
                                 ObjectFile="vc_mswuddll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswuddll\helpview\"\r
                                 ObjectFile="vc_mswuddll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\helpview.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswuddll\helpview.pdb"\r
                                 ProgramDatabaseFile="vc_mswuddll\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\helpview_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
@@ -322,74 +272,60 @@
                         IntermediateDirectory="vc_mswunivu\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivu\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivu\helpview\"\r
                                 ObjectFile="vc_mswunivu\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivu\helpview\"\r
                                 ObjectFile="vc_mswunivu\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\helpview.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivu\helpview.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivu\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\helpview_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
@@ -397,74 +333,63 @@
                         IntermediateDirectory="vc_mswunivud\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivud\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivud\helpview\"\r
                                 ObjectFile="vc_mswunivud\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivud\helpview\"\r
                                 ObjectFile="vc_mswunivud\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\helpview.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivud\helpview.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivud\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\helpview_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
@@ -472,74 +397,60 @@
                         IntermediateDirectory="vc_mswu\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswu\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswu\helpview\"\r
                                 ObjectFile="vc_mswu\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswu\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswu\helpview\"\r
                                 ObjectFile="vc_mswu\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswu\helpview.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswu\helpview.pdb"\r
                                 ProgramDatabaseFile="vc_mswu\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\helpview_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
@@ -547,74 +458,63 @@
                         IntermediateDirectory="vc_mswud\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswud\helpview"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswud\helpview\"\r
                                 ObjectFile="vc_mswud\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswud\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswud\helpview\"\r
                                 ObjectFile="vc_mswud\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswud\helpview.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswud\helpview.pdb"\r
                                 ProgramDatabaseFile="vc_mswud\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\helpview_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
@@ -623,17 +523,19 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\helpview.cpp"/>\r
+                               RelativePath=".\helpview.cpp">\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\helpview.rc"/>\r
+                               RelativePath=".\helpview.rc">\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/utils/helpview/src/helpview_vc8.vcproj b/utils/helpview/src/helpview_vc8.vcproj

index 5b7c40bb0d5b60c658f5913efad5c8fa8805cde8..4d2e872b1e2fd8d2ed94c12a83bcf9ab6f175493 100644 (file)
--- a/utils/helpview/src/helpview_vc8.vcproj
+++ b/utils/helpview/src/helpview_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -43,57 +43,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\helpview\"\r
                                 ObjectFile="vc_mswunivudll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\helpview\"\r
                                 ObjectFile="vc_mswunivudll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\helpview.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -137,57 +136,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\helpview\"\r
                                 ObjectFile="vc_mswunivuddll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\helpview\"\r
                                 ObjectFile="vc_mswunivuddll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\helpview.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -231,57 +232,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\helpview\"\r
                                 ObjectFile="vc_mswudll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswudll\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\helpview\"\r
                                 ObjectFile="vc_mswudll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswudll\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\helpview.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -325,57 +325,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\helpview\"\r
                                 ObjectFile="vc_mswuddll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\helpview\"\r
                                 ObjectFile="vc_mswuddll\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\helpview.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -419,57 +421,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\helpview\"\r
                                 ObjectFile="vc_mswunivu\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\helpview\"\r
                                 ObjectFile="vc_mswunivu\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\helpview.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -513,57 +514,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\helpview\"\r
                                 ObjectFile="vc_mswunivud\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\helpview\"\r
                                 ObjectFile="vc_mswunivud\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\helpview.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -607,57 +610,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\helpview\"\r
                                 ObjectFile="vc_mswu\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswu\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\helpview\"\r
                                 ObjectFile="vc_mswu\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswu\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\helpview.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -701,57 +703,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\helpview\"\r
                                 ObjectFile="vc_mswud\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswud\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\helpview\"\r
                                 ObjectFile="vc_mswud\helpview\"\r
                                 ProgramDataBaseFileName="vc_mswud\helpview.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\helpview.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\helpview.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\helpview.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\helpview.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -780,21 +784,23 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         >\r
                         <File\r
                                 RelativePath=".\helpview.cpp"\r
                         >\r
                         <File\r
                                 RelativePath=".\helpview.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         >\r
                         <File\r
                                 RelativePath=".\helpview.rc"\r
                         >\r
                         <File\r
                                 RelativePath=".\helpview.rc"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/utils/helpview/src/makefile.bcc b/utils/helpview/src/makefile.bcc

index 4daf8bb5bd5c6244f6afd12a70fd35a17f35bbe5..3c67551ab35f625a7803c383fcb3ff3faf5c1566 100644 (file)
--- a/utils/helpview/src/makefile.bcc
+++ b/utils/helpview/src/makefile.bcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -237,7 +237,7 @@ clean:
         -if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils
  
  $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS)  $(OBJS)\helpview_helpview.res
         -if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils
  
  $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS)  $(OBJS)\helpview_helpview.res
-       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
         c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res
  |
  
         c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res
  |
  
diff --git a/utils/helpview/src/makefile.gcc b/utils/helpview/src/makefile.gcc

index 568207ab3c6d3e1d55075e11258f4fe16e7792ab..1281e18d6ea6a6a0e9ed6ed4117bcc4c6847ac75 100644 (file)
--- a/utils/helpview/src/makefile.gcc
+++ b/utils/helpview/src/makefile.gcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
  
  ### Variables: ###
  
  
  ### Variables: ###
  
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
@@ -232,7 +232,7 @@ clean:
         -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
  
  $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o
         -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
  
  $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o
-       $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(HELPVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
  
  data: 
         if not exist $(OBJS) mkdir $(OBJS)
  
  data: 
         if not exist $(OBJS) mkdir $(OBJS)
diff --git a/utils/helpview/src/makefile.vc b/utils/helpview/src/makefile.vc

index 41af78fc5624c356f93d091fb57263f320ef76da..da8e0e3b93bd16a06ec10fef3f93a81570a46fb3 100644 (file)
--- a/utils/helpview/src/makefile.vc
+++ b/utils/helpview/src/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  DIR_SUFFIX_CPU = _amd64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
@@ -313,7 +313,7 @@ clean:
         -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb
  
  $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
         -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb
  
  $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
         $(HELPVIEW_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
         $(HELPVIEW_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
diff --git a/utils/helpview/src/makefile.wat b/utils/helpview/src/makefile.wat

index 94ad2412606fc9e1b9452f9aff2169633ffb7b1c..c55b4316af11a3e1c789b54fd5f92c64a9ccd070 100644 (file)
--- a/utils/helpview/src/makefile.wat
+++ b/utils/helpview/src/makefile.wat
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -261,7 +261,7 @@ $(OBJS)\helpview.exe :  $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
         @%append $(OBJS)\helpview.lbc option quiet
         @%append $(OBJS)\helpview.lbc name $^@
         @%append $(OBJS)\helpview.lbc option caseexact
         @%append $(OBJS)\helpview.lbc option quiet
         @%append $(OBJS)\helpview.lbc name $^@
         @%append $(OBJS)\helpview.lbc option caseexact
-       @%append $(OBJS)\helpview.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\helpview.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
         @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i
         @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\helpview.lbc library %i
         @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res
         @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i
         @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\helpview.lbc library %i
         @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res
diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in

index 5f14037ac2a3cd1003d81d1b4f35abd39712e784..a4f419744308e00144b565eea9903c30d7353185 100644 (file)
--- a/utils/hhp2cached/Makefile.in
+++ b/utils/hhp2cached/Makefile.in
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -61,7 +61,7 @@ HHP2CACHED_OBJECTS =  \
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
@@ -102,28 +102,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  
  ### Targets: ###
  
  all: hhp2cached$(EXEEXT)
  
  
  ### Targets: ###
  
  all: hhp2cached$(EXEEXT)
  
-install: all install_hhp2cached
+install: install_hhp2cached
  
  uninstall: uninstall_hhp2cached
  
  
  uninstall: uninstall_hhp2cached
  
@@ -139,12 +139,12 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  hhp2cached$(EXEEXT): $(HHP2CACHED_OBJECTS) $(__hhp2cached___win32rc)
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  hhp2cached$(EXEEXT): $(HHP2CACHED_OBJECTS) $(__hhp2cached___win32rc)
-       $(CXX) -o $@ $(HHP2CACHED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(HHP2CACHED_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(LDFLAGS)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
         
         $(__hhp2cached___mac_setfilecmd)
         $(__hhp2cached___os2_emxbindcmd)
  
         
         $(__hhp2cached___mac_setfilecmd)
         $(__hhp2cached___os2_emxbindcmd)
  
-install_hhp2cached: 
+install_hhp2cached: hhp2cached$(EXEEXT)
         $(INSTALL_DIR) $(DESTDIR)$(bindir)
         $(INSTALL_PROGRAM) hhp2cached$(EXEEXT) $(DESTDIR)$(bindir)
  
         $(INSTALL_DIR) $(DESTDIR)$(bindir)
         $(INSTALL_PROGRAM) hhp2cached$(EXEEXT) $(DESTDIR)$(bindir)
  
@@ -168,6 +168,7 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
  
  
-.PHONY: all install uninstall clean distclean install_hhp2cached uninstall_hhp2cached
+.PHONY: all install uninstall clean distclean install_hhp2cached \
+       uninstall_hhp2cached
diff --git a/utils/hhp2cached/hhp2cached_vc7.vcproj b/utils/hhp2cached/hhp2cached_vc7.vcproj

index c1a73a97aef713ca1e618a4c0c744c0901592a57..aca61eb002dcbaa25976c7cdf7c80611c7ba2747 100644 (file)
--- a/utils/hhp2cached/hhp2cached_vc7.vcproj
+++ b/utils/hhp2cached/hhp2cached_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -22,74 +22,60 @@
                         IntermediateDirectory="vc_mswunivudll\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivudll\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivudll\hhp2cached\"\r
                                 ObjectFile="vc_mswunivudll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivudll\hhp2cached\"\r
                                 ObjectFile="vc_mswunivudll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivudll\hhp2cached.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivudll\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\hhp2cached_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
@@ -97,74 +83,63 @@
                         IntermediateDirectory="vc_mswunivuddll\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivuddll\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivuddll\hhp2cached\"\r
                                 ObjectFile="vc_mswunivuddll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivuddll\hhp2cached\"\r
                                 ObjectFile="vc_mswunivuddll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\hhp2cached.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\hhp2cached_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
@@ -172,74 +147,60 @@
                         IntermediateDirectory="vc_mswudll\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswudll\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswudll\hhp2cached\"\r
                                 ObjectFile="vc_mswudll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswudll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswudll\hhp2cached\"\r
                                 ObjectFile="vc_mswudll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswudll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswudll\hhp2cached.pdb"\r
                                 ProgramDatabaseFile="vc_mswudll\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\hhp2cached_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
@@ -247,74 +208,63 @@
                         IntermediateDirectory="vc_mswuddll\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswuddll\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswuddll\hhp2cached\"\r
                                 ObjectFile="vc_mswuddll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswuddll\hhp2cached\"\r
                                 ObjectFile="vc_mswuddll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswuddll\hhp2cached.pdb"\r
                                 ProgramDatabaseFile="vc_mswuddll\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\hhp2cached_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
@@ -322,74 +272,60 @@
                         IntermediateDirectory="vc_mswunivu\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivu\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivu\hhp2cached\"\r
                                 ObjectFile="vc_mswunivu\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivu\hhp2cached\"\r
                                 ObjectFile="vc_mswunivu\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivu\hhp2cached.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivu\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\hhp2cached_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
@@ -397,74 +333,63 @@
                         IntermediateDirectory="vc_mswunivud\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivud\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivud\hhp2cached\"\r
                                 ObjectFile="vc_mswunivud\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivud\hhp2cached\"\r
                                 ObjectFile="vc_mswunivud\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivud\hhp2cached.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivud\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\hhp2cached_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
@@ -472,74 +397,60 @@
                         IntermediateDirectory="vc_mswu\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswu\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswu\hhp2cached\"\r
                                 ObjectFile="vc_mswu\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswu\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswu\hhp2cached\"\r
                                 ObjectFile="vc_mswu\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswu\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswu\hhp2cached.pdb"\r
                                 ProgramDatabaseFile="vc_mswu\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\hhp2cached_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
@@ -547,74 +458,63 @@
                         IntermediateDirectory="vc_mswud\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswud\hhp2cached"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswud\hhp2cached\"\r
                                 ObjectFile="vc_mswud\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswud\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswud\hhp2cached\"\r
                                 ObjectFile="vc_mswud\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswud\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswud\hhp2cached.pdb"\r
                                 ProgramDatabaseFile="vc_mswud\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\hhp2cached_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
@@ -623,17 +523,19 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\hhp2cached.cpp"/>\r
+                               RelativePath=".\hhp2cached.cpp">\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\hhp2cached.rc"/>\r
+                               RelativePath=".\hhp2cached.rc">\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/utils/hhp2cached/hhp2cached_vc8.vcproj b/utils/hhp2cached/hhp2cached_vc8.vcproj

index 246a4610e78ed4dcd4462442303a600804933cb8..982eaf293afdbd49bf75509c9a923cb1aef2ac8b 100644 (file)
--- a/utils/hhp2cached/hhp2cached_vc8.vcproj
+++ b/utils/hhp2cached/hhp2cached_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -43,57 +43,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\hhp2cached\"\r
                                 ObjectFile="vc_mswunivudll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\hhp2cached\"\r
                                 ObjectFile="vc_mswunivudll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivudll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\hhp2cached.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -137,57 +136,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\hhp2cached\"\r
                                 ObjectFile="vc_mswunivuddll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\hhp2cached\"\r
                                 ObjectFile="vc_mswunivuddll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivuddll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\hhp2cached.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -231,57 +232,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\hhp2cached\"\r
                                 ObjectFile="vc_mswudll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswudll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\hhp2cached\"\r
                                 ObjectFile="vc_mswudll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswudll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswudll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\hhp2cached.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -325,57 +325,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\hhp2cached\"\r
                                 ObjectFile="vc_mswuddll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\hhp2cached\"\r
                                 ObjectFile="vc_mswuddll\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswuddll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\hhp2cached.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -419,57 +421,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\hhp2cached\"\r
                                 ObjectFile="vc_mswunivu\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\hhp2cached\"\r
                                 ObjectFile="vc_mswunivu\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswunivu\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\hhp2cached.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -513,57 +514,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\hhp2cached\"\r
                                 ObjectFile="vc_mswunivud\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\hhp2cached\"\r
                                 ObjectFile="vc_mswunivud\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswunivud\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\hhp2cached.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -607,57 +610,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\hhp2cached\"\r
                                 ObjectFile="vc_mswu\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswu\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\hhp2cached\"\r
                                 ObjectFile="vc_mswu\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswu\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   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"\r
                                 OutputFile="vc_mswu\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\hhp2cached.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -701,57 +703,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\hhp2cached\"\r
                                 ObjectFile="vc_mswud\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswud\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\hhp2cached\"\r
                                 ObjectFile="vc_mswud\hhp2cached\"\r
                                 ProgramDataBaseFileName="vc_mswud\hhp2cached.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud.lib   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"\r
                                 OutputFile="vc_mswud\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\hhp2cached.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="2"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\hhp2cached.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\hhp2cached.pdb"\r
+                               SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -780,21 +784,23 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         >\r
                         <File\r
                                 RelativePath=".\hhp2cached.cpp"\r
                         >\r
                         <File\r
                                 RelativePath=".\hhp2cached.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
                 </Filter>\r
                 <Filter\r
                         Name="Resource Files"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         >\r
                         <File\r
                                 RelativePath=".\hhp2cached.rc"\r
                         >\r
                         <File\r
                                 RelativePath=".\hhp2cached.rc"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/utils/hhp2cached/makefile.bcc b/utils/hhp2cached/makefile.bcc

index 7e7002eb442e8b8cecaccbc4a764109600231a4e..2efefa3d70209535bbbd406dca7fef54897cb486 100644 (file)
--- a/utils/hhp2cached/makefile.bcc
+++ b/utils/hhp2cached/makefile.bcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -233,7 +233,7 @@ clean:
         -if exist $(OBJS)\hhp2cached.ils del $(OBJS)\hhp2cached.ils
  
  $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS)  $(OBJS)\hhp2cached_hhp2cached.res
         -if exist $(OBJS)\hhp2cached.ils del $(OBJS)\hhp2cached.ils
  
  $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS)  $(OBJS)\hhp2cached_hhp2cached.res
-       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
         c0w32.obj $(HHP2CACHED_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\hhp2cached_hhp2cached.res
  |
  
         c0w32.obj $(HHP2CACHED_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\hhp2cached_hhp2cached.res
  |
  
diff --git a/utils/hhp2cached/makefile.gcc b/utils/hhp2cached/makefile.gcc

index 21e25b74aa87d9cc929a5a28d2acd18a3cb38ada..3978d58b901311ce15c565d8e51fb49f4a772202 100644 (file)
--- a/utils/hhp2cached/makefile.gcc
+++ b/utils/hhp2cached/makefile.gcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
  
  ### Variables: ###
  
  
  ### Variables: ###
  
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
@@ -228,7 +228,7 @@ clean:
         -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe
  
  $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached_rc.o
         -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe
  
  $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached_rc.o
-       $(CXX) -o $@ $(HHP2CACHED_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(HHP2CACHED_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
  
  $(OBJS)\hhp2cached_hhp2cached.o: ./hhp2cached.cpp
         $(CXX) -c -o $@ $(HHP2CACHED_CXXFLAGS) $(CPPDEPS) $<
  
  $(OBJS)\hhp2cached_hhp2cached.o: ./hhp2cached.cpp
         $(CXX) -c -o $@ $(HHP2CACHED_CXXFLAGS) $(CPPDEPS) $<
diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc

index f753e8dfc559abba90ab3635805d11427dec7b1e..738313231e7698378d5b2a5381f54cbfe50b883a 100644 (file)
--- a/utils/hhp2cached/makefile.vc
+++ b/utils/hhp2cached/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  DIR_SUFFIX_CPU = _amd64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
@@ -309,7 +309,7 @@ clean:
         -if exist $(OBJS)\hhp2cached.pdb del $(OBJS)\hhp2cached.pdb
  
  $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res
         -if exist $(OBJS)\hhp2cached.pdb del $(OBJS)\hhp2cached.pdb
  
  $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\hhp2cached.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\hhp2cached.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
         $(HHP2CACHED_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
         $(HHP2CACHED_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
diff --git a/utils/hhp2cached/makefile.wat b/utils/hhp2cached/makefile.wat

index abb040068ba41c57648762f8987db3711b4dd9b8..6069a7ff78e13e9cfede55edc69491e0b5c523d5 100644 (file)
--- a/utils/hhp2cached/makefile.wat
+++ b/utils/hhp2cached/makefile.wat
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -256,7 +256,7 @@ $(OBJS)\hhp2cached.exe :  $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.re
         @%append $(OBJS)\hhp2cached.lbc option quiet
         @%append $(OBJS)\hhp2cached.lbc name $^@
         @%append $(OBJS)\hhp2cached.lbc option caseexact
         @%append $(OBJS)\hhp2cached.lbc option quiet
         @%append $(OBJS)\hhp2cached.lbc name $^@
         @%append $(OBJS)\hhp2cached.lbc option caseexact
-       @%append $(OBJS)\hhp2cached.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\hhp2cached.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
         @for %i in ($(HHP2CACHED_OBJECTS)) do @%append $(OBJS)\hhp2cached.lbc file %i
         @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\hhp2cached.lbc library %i
         @%append $(OBJS)\hhp2cached.lbc option resource=$(OBJS)\hhp2cached_hhp2cached.res
         @for %i in ($(HHP2CACHED_OBJECTS)) do @%append $(OBJS)\hhp2cached.lbc file %i
         @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\hhp2cached.lbc library %i
         @%append $(OBJS)\hhp2cached.lbc option resource=$(OBJS)\hhp2cached_hhp2cached.res
diff --git a/utils/ifacecheck/src/Makefile.in b/utils/ifacecheck/src/Makefile.in

index 7b767716b1ab4c9ca1c8fd04747de66b41fd274c..66ace7012baa976f24826df93f0417fc4732940d 100644 (file)
--- a/utils/ifacecheck/src/Makefile.in
+++ b/utils/ifacecheck/src/Makefile.in
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -56,7 +56,7 @@ IFACECHECK_OBJECTS =  \
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
@@ -79,19 +79,19 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  
  ### Targets: ###
  
  all: ifacecheck$(EXEEXT)
  
  
  ### Targets: ###
  
  all: ifacecheck$(EXEEXT)
  
-install: all install_ifacecheck
+install: install_ifacecheck
  
  uninstall: uninstall_ifacecheck
  
  
  uninstall: uninstall_ifacecheck
  
@@ -107,11 +107,11 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  ifacecheck$(EXEEXT): $(IFACECHECK_OBJECTS)
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  ifacecheck$(EXEEXT): $(IFACECHECK_OBJECTS)
-       $(CXX) -o $@ $(IFACECHECK_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(IFACECHECK_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
         
         $(__ifacecheck___mac_setfilecmd)
  
         
         $(__ifacecheck___mac_setfilecmd)
  
-install_ifacecheck: 
+install_ifacecheck: ifacecheck$(EXEEXT)
         $(INSTALL_DIR) $(DESTDIR)$(bindir)
         $(INSTALL_PROGRAM) ifacecheck$(EXEEXT) $(DESTDIR)$(bindir)
  
         $(INSTALL_DIR) $(DESTDIR)$(bindir)
         $(INSTALL_PROGRAM) ifacecheck$(EXEEXT) $(DESTDIR)$(bindir)
  
@@ -135,6 +135,7 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
  
  
-.PHONY: all install uninstall clean distclean install_ifacecheck uninstall_ifacecheck
+.PHONY: all install uninstall clean distclean install_ifacecheck \
+       uninstall_ifacecheck
diff --git a/utils/ifacecheck/src/ifacecheck.dsp b/utils/ifacecheck/src/ifacecheck.dsp

index 6aa77cdf89aa1abc85219f21e72bffc4ed212a55..ddaa895b509b139bae5cd6b5ffdb33e971795060 100644 (file)
--- a/utils/ifacecheck/src/ifacecheck.dsp
+++ b/utils/ifacecheck/src/ifacecheck.dsp
@@ -242,6 +242,14 @@ SOURCE=.\ifacecheck.cpp
  SOURCE=.\xmlparser.cpp\r
  # End Source File\r
  # End Group\r
  SOURCE=.\xmlparser.cpp\r
  # End Source File\r
  # End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=.\xmlparser.h\r
+# End Source File\r
+# End Group\r
  # End Target\r
  # End Project\r
  \r
  # End Target\r
  # End Project\r
  \r
diff --git a/utils/ifacecheck/src/ifacecheck_vc7.vcproj b/utils/ifacecheck/src/ifacecheck_vc7.vcproj

index 08746c12d4558b581fb9eec517111469439a1b49..12e43c9dcbd268f007bb196db59dc7ea046ea1c7 100644 (file)
--- a/utils/ifacecheck/src/ifacecheck_vc7.vcproj
+++ b/utils/ifacecheck/src/ifacecheck_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -22,74 +22,60 @@
                         IntermediateDirectory="vc_mswunivudll\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivudll\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;."\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivudll\ifacecheck\"\r
                                 ObjectFile="vc_mswunivudll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivudll\ifacecheck\"\r
                                 ObjectFile="vc_mswunivudll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswunivudll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivudll\ifacecheck.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivudll\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\ifacecheck_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;."/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
@@ -97,74 +83,63 @@
                         IntermediateDirectory="vc_mswunivuddll\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivuddll\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;."\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivuddll\ifacecheck\"\r
                                 ObjectFile="vc_mswunivuddll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivuddll\ifacecheck\"\r
                                 ObjectFile="vc_mswunivuddll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswunivuddll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\ifacecheck.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\ifacecheck_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;."/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
@@ -172,74 +147,60 @@
                         IntermediateDirectory="vc_mswudll\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswudll\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;."\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswudll\ifacecheck\"\r
                                 ObjectFile="vc_mswudll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswudll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswudll\ifacecheck\"\r
                                 ObjectFile="vc_mswudll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswudll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswudll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswudll\ifacecheck.pdb"\r
                                 ProgramDatabaseFile="vc_mswudll\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\ifacecheck_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;."/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
@@ -247,74 +208,63 @@
                         IntermediateDirectory="vc_mswuddll\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswuddll\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;."\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswuddll\ifacecheck\"\r
                                 ObjectFile="vc_mswuddll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswuddll\ifacecheck\"\r
                                 ObjectFile="vc_mswuddll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswuddll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswuddll\ifacecheck.pdb"\r
                                 ProgramDatabaseFile="vc_mswuddll\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\ifacecheck_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;."/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
@@ -322,74 +272,60 @@
                         IntermediateDirectory="vc_mswunivu\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivu\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;."\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivu\ifacecheck\"\r
                                 ObjectFile="vc_mswunivu\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivu\ifacecheck\"\r
                                 ObjectFile="vc_mswunivu\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswunivu\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivu\ifacecheck.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivu\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\ifacecheck_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;."/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
@@ -397,74 +333,63 @@
                         IntermediateDirectory="vc_mswunivud\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivud\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;."\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivud\ifacecheck\"\r
                                 ObjectFile="vc_mswunivud\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivud\ifacecheck\"\r
                                 ObjectFile="vc_mswunivud\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswunivud\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivud\ifacecheck.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivud\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\ifacecheck_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;."/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
@@ -472,74 +397,60 @@
                         IntermediateDirectory="vc_mswu\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswu\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;."\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswu\ifacecheck\"\r
                                 ObjectFile="vc_mswu\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswu\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswu\ifacecheck\"\r
                                 ObjectFile="vc_mswu\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswu\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswu\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswu\ifacecheck.pdb"\r
                                 ProgramDatabaseFile="vc_mswu\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\ifacecheck_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;."/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
@@ -547,74 +458,63 @@
                         IntermediateDirectory="vc_mswud\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswud\ifacecheck"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;."\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswud\ifacecheck\"\r
                                 ObjectFile="vc_mswud\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswud\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswud\ifacecheck\"\r
                                 ObjectFile="vc_mswud\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswud\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswud\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswud\ifacecheck.pdb"\r
                                 ProgramDatabaseFile="vc_mswud\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\ifacecheck_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;."/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
@@ -623,12 +523,22 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+                       <File\r
+                               RelativePath=".\ifacecheck.cpp">\r
+                       </File>\r
                         <File\r
                         <File\r
-                               RelativePath=".\ifacecheck.cpp"/>\r
+                               RelativePath=".\xmlparser.cpp">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\xmlparser.cpp"/>\r
+                               RelativePath=".\xmlparser.h">\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/utils/ifacecheck/src/ifacecheck_vc8.vcproj b/utils/ifacecheck/src/ifacecheck_vc8.vcproj

index b95826257265d25a099fe1ff12a662d6b7954a95..f61f43bec3ffe0830fe355cdfb539b3710009980 100644 (file)
--- a/utils/ifacecheck/src/ifacecheck_vc8.vcproj
+++ b/utils/ifacecheck/src/ifacecheck_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -43,57 +43,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;."\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\ifacecheck\"\r
                                 ObjectFile="vc_mswunivudll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\ifacecheck\"\r
                                 ObjectFile="vc_mswunivudll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswunivudll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\ifacecheck.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -137,57 +136,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\ifacecheck\"\r
                                 ObjectFile="vc_mswunivuddll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\ifacecheck\"\r
                                 ObjectFile="vc_mswunivuddll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswunivuddll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\ifacecheck.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -231,57 +232,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;."\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\ifacecheck\"\r
                                 ObjectFile="vc_mswudll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswudll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\ifacecheck\"\r
                                 ObjectFile="vc_mswudll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswudll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswudll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\ifacecheck.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -325,57 +325,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\ifacecheck\"\r
                                 ObjectFile="vc_mswuddll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\ifacecheck\"\r
                                 ObjectFile="vc_mswuddll\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswuddll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\ifacecheck.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -419,57 +421,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;."\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\ifacecheck\"\r
                                 ObjectFile="vc_mswunivu\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\ifacecheck\"\r
                                 ObjectFile="vc_mswunivu\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswunivu\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\ifacecheck.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -513,57 +514,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\ifacecheck\"\r
                                 ObjectFile="vc_mswunivud\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\ifacecheck\"\r
                                 ObjectFile="vc_mswunivud\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswunivud\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\ifacecheck.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -607,57 +610,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;."\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\ifacecheck\"\r
                                 ObjectFile="vc_mswu\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswu\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\ifacecheck\"\r
                                 ObjectFile="vc_mswu\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswu\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswu\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\ifacecheck.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -701,57 +703,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\ifacecheck\"\r
                                 ObjectFile="vc_mswud\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswud\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\ifacecheck\"\r
                                 ObjectFile="vc_mswud\ifacecheck\"\r
                                 ProgramDataBaseFileName="vc_mswud\ifacecheck.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswud\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\ifacecheck.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\ifacecheck.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\ifacecheck.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -780,15 +784,27 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         >\r
                         <File\r
                                 RelativePath=".\ifacecheck.cpp"\r
                         >\r
                         <File\r
                                 RelativePath=".\ifacecheck.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath=".\xmlparser.cpp"\r
                         <File\r
                                 RelativePath=".\xmlparser.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\xmlparser.h"\r
+                               >\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/utils/ifacecheck/src/makefile.bcc b/utils/ifacecheck/src/makefile.bcc

index 2d3eb794974b717f24b14af1543e78f081d5dc6a..98f158819e235bf90176c96982738f11c4006da2 100644 (file)
--- a/utils/ifacecheck/src/makefile.bcc
+++ b/utils/ifacecheck/src/makefile.bcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -188,7 +188,7 @@ clean:
         -if exist $(OBJS)\ifacecheck.ils del $(OBJS)\ifacecheck.ils
  
  $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
         -if exist $(OBJS)\ifacecheck.ils del $(OBJS)\ifacecheck.ils
  
  $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
-       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|
         c0x32.obj $(IFACECHECK_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
  |
  
         c0x32.obj $(IFACECHECK_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
  |
  
diff --git a/utils/ifacecheck/src/makefile.gcc b/utils/ifacecheck/src/makefile.gcc

index 25d7cf6d30b1d158868c53f0eea541c287c6341f..9ed8c3a1a7f9b70630afb6d3df02cd0d55ffc231 100644 (file)
--- a/utils/ifacecheck/src/makefile.gcc
+++ b/utils/ifacecheck/src/makefile.gcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
  
  ### Variables: ###
  
  
  ### Variables: ###
  
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
@@ -180,7 +180,7 @@ clean:
         -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe
  
  $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
         -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe
  
  $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
-       $(CXX) -o $@ $(IFACECHECK_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)   $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(IFACECHECK_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
  
  $(OBJS)\ifacecheck_ifacecheck.o: ./ifacecheck.cpp
         $(CXX) -c -o $@ $(IFACECHECK_CXXFLAGS) $(CPPDEPS) $<
  
  $(OBJS)\ifacecheck_ifacecheck.o: ./ifacecheck.cpp
         $(CXX) -c -o $@ $(IFACECHECK_CXXFLAGS) $(CPPDEPS) $<
diff --git a/utils/ifacecheck/src/makefile.vc b/utils/ifacecheck/src/makefile.vc

index a0cb60081516ea8cd3d05fee642543035346dc50..b771df35b690fd726c628d8d2e5524c040839e69 100644 (file)
--- a/utils/ifacecheck/src/makefile.vc
+++ b/utils/ifacecheck/src/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  DIR_SUFFIX_CPU = _amd64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
@@ -245,7 +245,7 @@ clean:
         -if exist $(OBJS)\ifacecheck.pdb del $(OBJS)\ifacecheck.pdb
  
  $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
         -if exist $(OBJS)\ifacecheck.pdb del $(OBJS)\ifacecheck.pdb
  
  $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
         $(IFACECHECK_OBJECTS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
         $(IFACECHECK_OBJECTS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  
diff --git a/utils/ifacecheck/src/makefile.wat b/utils/ifacecheck/src/makefile.wat

index b6e0f4c4e521905f82515121b1d95ee2a89b80c4..1cab5b6aa97b7232d29b68614c23c6c8c71d267d 100644 (file)
--- a/utils/ifacecheck/src/makefile.wat
+++ b/utils/ifacecheck/src/makefile.wat
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -240,7 +240,7 @@ $(OBJS)\ifacecheck.exe :  $(IFACECHECK_OBJECTS)
         @%append $(OBJS)\ifacecheck.lbc option quiet
         @%append $(OBJS)\ifacecheck.lbc name $^@
         @%append $(OBJS)\ifacecheck.lbc option caseexact
         @%append $(OBJS)\ifacecheck.lbc option quiet
         @%append $(OBJS)\ifacecheck.lbc name $^@
         @%append $(OBJS)\ifacecheck.lbc option caseexact
-       @%append $(OBJS)\ifacecheck.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_'
+       @%append $(OBJS)\ifacecheck.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)
         @for %i in ($(IFACECHECK_OBJECTS)) do @%append $(OBJS)\ifacecheck.lbc file %i
         @for %i in ( $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\ifacecheck.lbc library %i
         @%append $(OBJS)\ifacecheck.lbc
         @for %i in ($(IFACECHECK_OBJECTS)) do @%append $(OBJS)\ifacecheck.lbc file %i
         @for %i in ( $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\ifacecheck.lbc library %i
         @%append $(OBJS)\ifacecheck.lbc
diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in

index 52a5adea3f0d76362ee9258541ba6b1fb6683752..db57d7190f3a4b285b8ad735904fe04052cf6575 100644 (file)
--- a/utils/wxrc/Makefile.in
+++ b/utils/wxrc/Makefile.in
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -56,7 +56,7 @@ WXRC_OBJECTS =  \
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
  @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
@@ -82,19 +82,19 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  
  ### Targets: ###
  
  all: $(__wxrc___depname)
  
  
  ### Targets: ###
  
  all: $(__wxrc___depname)
  
-install: all $(__install_wxrc___depname)
+install: $(__install_wxrc___depname)
  
  uninstall: $(__uninstall_wxrc___depname)
  
  
  uninstall: $(__uninstall_wxrc___depname)
  
@@ -110,11 +110,11 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
-@COND_USE_XRC_1@       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_USE_XRC_1@       $(CXX) -o $@ $(WXRC_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
  @COND_USE_XRC_1@       
  @COND_USE_XRC_1@       $(__wxrc___mac_setfilecmd)
  
  @COND_USE_XRC_1@       
  @COND_USE_XRC_1@       $(__wxrc___mac_setfilecmd)
  
-@COND_USE_XRC_1@install_wxrc: 
+@COND_USE_XRC_1@install_wxrc: $(__wxrc___depname)
  @COND_USE_XRC_1@       $(INSTALL_DIR) $(DESTDIR)$(bindir)
  @COND_USE_XRC_1@       $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
  @COND_USE_XRC_1@       rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
  @COND_USE_XRC_1@       $(INSTALL_DIR) $(DESTDIR)$(bindir)
  @COND_USE_XRC_1@       $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
  @COND_USE_XRC_1@       rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
@@ -139,6 +139,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
  $(srcdir)/include/wx/stc/stc.h
  
  # Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d
  
  .PHONY: all install uninstall clean distclean install_wxrc uninstall_wxrc
  
  .PHONY: all install uninstall clean distclean install_wxrc uninstall_wxrc
diff --git a/utils/wxrc/makefile.bcc b/utils/wxrc/makefile.bcc

index b8d07a19f54193782a62ac177ec674adb6fe8192..57b3d0b1dd2b75deefacfa69b76eddc2a450631a 100644 (file)
--- a/utils/wxrc/makefile.bcc
+++ b/utils/wxrc/makefile.bcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -191,7 +191,7 @@ clean:
  
  !if "$(USE_XRC)" == "1"
  $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
  
  !if "$(USE_XRC)" == "1"
  $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
-       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|
         c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
  |
  !endif
         c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
  |
  !endif
diff --git a/utils/wxrc/makefile.gcc b/utils/wxrc/makefile.gcc

index 3a1fc32507711d9a69ad56a8797cb7f316272fde..65976ed1718fe1461b9a047603a3f3bb2dddc647 100644 (file)
--- a/utils/wxrc/makefile.gcc
+++ b/utils/wxrc/makefile.gcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
  
  ### Variables: ###
  
  
  ### Variables: ###
  
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
  WX_RELEASE_NODOT = 29
  COMPILER_PREFIX = gcc
  OBJS = \
@@ -183,7 +183,7 @@ clean:
  
  ifeq ($(USE_XRC),1)
  $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
  
  ifeq ($(USE_XRC),1)
  $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
-       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)   $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(WXRC_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
  endif
  
  $(OBJS)\wxrc_wxrc.o: ./wxrc.cpp
  endif
  
  $(OBJS)\wxrc_wxrc.o: ./wxrc.cpp
diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc

index cc7c74d500f3c3f07a055708ac1a82c6469004b6..059801a938273c1d8289497a085bce72e3d643c1 100644 (file)
--- a/utils/wxrc/makefile.vc
+++ b/utils/wxrc/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -51,18 +51,18 @@ WXUNICODEFLAG = u
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  DIR_SUFFIX_CPU = _amd64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
@@ -72,18 +72,18 @@ LIBTYPE_SUFFIX = lib
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
@@ -248,7 +248,7 @@ clean:
  
  !if "$(USE_XRC)" == "1"
  $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
  
  !if "$(USE_XRC)" == "1"
  $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxrc.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxrc.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
         $(WXRC_OBJECTS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  !endif
         $(WXRC_OBJECTS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
  <<
  !endif
diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat

index 8963f5e1ef91252c8e85fb319be4566a55264b72..b913943389a3471058b84553d0a1006c417ca707 100644 (file)
--- a/utils/wxrc/makefile.wat
+++ b/utils/wxrc/makefile.wat
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -243,7 +243,7 @@ $(OBJS)\wxrc.exe :  $(WXRC_OBJECTS)
         @%append $(OBJS)\wxrc.lbc option quiet
         @%append $(OBJS)\wxrc.lbc name $^@
         @%append $(OBJS)\wxrc.lbc option caseexact
         @%append $(OBJS)\wxrc.lbc option quiet
         @%append $(OBJS)\wxrc.lbc name $^@
         @%append $(OBJS)\wxrc.lbc option caseexact
-       @%append $(OBJS)\wxrc.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_'
+       @%append $(OBJS)\wxrc.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)
         @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i
         @for %i in ( $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\wxrc.lbc library %i
         @%append $(OBJS)\wxrc.lbc
         @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i
         @for %i in ( $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\wxrc.lbc library %i
         @%append $(OBJS)\wxrc.lbc
diff --git a/utils/wxrc/wxrc_vc7.vcproj b/utils/wxrc/wxrc_vc7.vcproj

index 96f01dbbbcb1b9764561fe1d48f57973c2e776a5..705888d3a04755822c558ee0e3709809e7c96f10 100644 (file)
--- a/utils/wxrc/wxrc_vc7.vcproj
+++ b/utils/wxrc/wxrc_vc7.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -22,74 +22,60 @@
                         IntermediateDirectory="vc_mswunivudll\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivudll\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivudll\wxrc\"\r
                                 ObjectFile="vc_mswunivudll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivudll\wxrc\"\r
                                 ObjectFile="vc_mswunivudll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\wxrc.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswunivudll\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivudll\wxrc.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivudll\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\wxrc_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Universal Debug|Win32"\r
@@ -97,74 +83,63 @@
                         IntermediateDirectory="vc_mswunivuddll\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivuddll\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivuddll\wxrc\"\r
                                 ObjectFile="vc_mswunivuddll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivuddll\wxrc\"\r
                                 ObjectFile="vc_mswunivuddll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\wxrc.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswunivuddll\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\wxrc.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\wxrc_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Release|Win32"\r
@@ -172,74 +147,60 @@
                         IntermediateDirectory="vc_mswudll\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswudll\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswudll\wxrc\"\r
                                 ObjectFile="vc_mswudll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswudll\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswudll\wxrc\"\r
                                 ObjectFile="vc_mswudll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswudll\wxrc.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswudll\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswudll\wxrc.pdb"\r
                                 ProgramDatabaseFile="vc_mswudll\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\wxrc_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
@@ -247,74 +208,63 @@
                         IntermediateDirectory="vc_mswuddll\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswuddll\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswuddll\wxrc\"\r
                                 ObjectFile="vc_mswuddll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswuddll\wxrc\"\r
                                 ObjectFile="vc_mswuddll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\wxrc.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswuddll\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswuddll\wxrc.pdb"\r
                                 ProgramDatabaseFile="vc_mswuddll\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\wxrc_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Release|Win32"\r
@@ -322,74 +272,60 @@
                         IntermediateDirectory="vc_mswunivu\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivu\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivu\wxrc\"\r
                                 ObjectFile="vc_mswunivu\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivu\wxrc\"\r
                                 ObjectFile="vc_mswunivu\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\wxrc.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswunivu\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivu\wxrc.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivu\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\wxrc_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Universal Debug|Win32"\r
@@ -397,74 +333,63 @@
                         IntermediateDirectory="vc_mswunivud\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswunivud\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswunivud\wxrc\"\r
                                 ObjectFile="vc_mswunivud\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswunivud\wxrc\"\r
                                 ObjectFile="vc_mswunivud\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\wxrc.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswunivud\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswunivud\wxrc.pdb"\r
                                 ProgramDatabaseFile="vc_mswunivud\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\wxrc_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Release|Win32"\r
@@ -472,74 +397,60 @@
                         IntermediateDirectory="vc_mswu\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswu\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswu\wxrc\"\r
                                 ObjectFile="vc_mswu\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswu\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswu\wxrc\"\r
                                 ObjectFile="vc_mswu\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswu\wxrc.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswu\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswu\wxrc.pdb"\r
                                 ProgramDatabaseFile="vc_mswu\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\wxrc_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
                 </Configuration>\r
                 <Configuration\r
                         Name="Debug|Win32"\r
@@ -547,74 +458,63 @@
                         IntermediateDirectory="vc_mswud\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         IntermediateDirectory="vc_mswud\wxrc"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
                                 AssemblerListingLocation="vc_mswud\wxrc\"\r
                                 ObjectFile="vc_mswud\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswud\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 AssemblerListingLocation="vc_mswud\wxrc\"\r
                                 ObjectFile="vc_mswud\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswud\wxrc.pdb"\r
                                 WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswud\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r
                                 ProgramDatabaseFile="vc_mswud\wxrc.pdb"\r
                                 ProgramDatabaseFile="vc_mswud\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\wxrc_vc7.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebDeploymentTool"/>\r
                         <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
                 </Configuration>\r
         </Configurations>\r
         <References>\r
@@ -623,10 +523,11 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
                         <File\r
                         <File\r
-                               RelativePath=".\wxrc.cpp"/>\r
+                               RelativePath=".\wxrc.cpp">\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
diff --git a/utils/wxrc/wxrc_vc8.vcproj b/utils/wxrc/wxrc_vc8.vcproj

index 297424344ebfd5104b4a78b1f211424e2d792b49..d2b5c90eda6423d8d2c04018117f5a086232a455 100644 (file)
--- a/utils/wxrc/wxrc_vc8.vcproj
+++ b/utils/wxrc/wxrc_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
    This makefile was generated by\r
  <!--\r
  \r
    This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -43,57 +43,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\wxrc\"\r
                                 ObjectFile="vc_mswunivudll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivudll\wxrc\"\r
                                 ObjectFile="vc_mswunivudll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivudll\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswunivudll\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivudll\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\wxrc.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivudll\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -137,57 +136,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\wxrc\"\r
                                 ObjectFile="vc_mswunivuddll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivuddll\wxrc\"\r
                                 ObjectFile="vc_mswunivuddll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivuddll\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswunivuddll\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivuddll\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\wxrc.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivuddll\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -231,57 +232,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\wxrc\"\r
                                 ObjectFile="vc_mswudll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswudll\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswudll\wxrc\"\r
                                 ObjectFile="vc_mswudll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswudll\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswudll\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswudll\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\wxrc.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswudll\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -325,57 +325,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\wxrc\"\r
                                 ObjectFile="vc_mswuddll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswuddll\wxrc\"\r
                                 ObjectFile="vc_mswuddll\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswuddll\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswuddll\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswuddll\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\wxrc.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswuddll\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -419,57 +421,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\wxrc\"\r
                                 ObjectFile="vc_mswunivu\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivu\wxrc\"\r
                                 ObjectFile="vc_mswunivu\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivu\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswunivu\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivu\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\wxrc.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivu\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -513,57 +514,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\wxrc\"\r
                                 ObjectFile="vc_mswunivud\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswunivud\wxrc\"\r
                                 ObjectFile="vc_mswunivud\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswunivud\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswunivud\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswunivud\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\wxrc.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswunivud\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -607,57 +610,56 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                 RuntimeLibrary="2"\r
                                 RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\wxrc\"\r
                                 ObjectFile="vc_mswu\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswu\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswu\wxrc\"\r
                                 ObjectFile="vc_mswu\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswu\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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"\r
                                 OutputFile="vc_mswu\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswu\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\wxrc.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswu\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -701,57 +703,59 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\wxrc\"\r
                                 ObjectFile="vc_mswud\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswud\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 RuntimeTypeInfo="true"\r
                                 AssemblerListingLocation="vc_mswud\wxrc\"\r
                                 ObjectFile="vc_mswud\wxrc\"\r
                                 ProgramDataBaseFileName="vc_mswud\wxrc.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 AdditionalOptions=""\r
                                 AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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"\r
                                 OutputFile="vc_mswud\wxrc.exe"\r
                                 LinkIncremental="2"\r
                                 OutputFile="vc_mswud\wxrc.exe"\r
                                 LinkIncremental="2"\r
-                               SubSystem="1"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\wxrc.pdb"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 ProgramDatabaseFile="vc_mswud\wxrc.pdb"\r
+                               SubSystem="1"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
@@ -780,12 +784,13 @@
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
         <Files>\r
                 <Filter\r
                         Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                         >\r
                         <File\r
                                 RelativePath=".\wxrc.cpp"\r
                         >\r
                         <File\r
                                 RelativePath=".\wxrc.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
author	Vadim Zeitlin <vadim@wxwidgets.org>
	Wed, 8 Oct 2008 15:47:51 +0000 (15:47 +0000)
committer	Vadim Zeitlin <vadim@wxwidgets.org>
	Wed, 8 Oct 2008 15:47:51 +0000 (15:47 +0000)
configure		patch \| blob \| blame \| history
demos/Makefile.in		patch \| blob \| blame \| history
demos/bombs/Makefile.in		patch \| blob \| blame \| history
demos/bombs/bombs_vc7.vcproj		patch \| blob \| blame \| history
demos/bombs/bombs_vc8.vcproj		patch \| blob \| blame \| history
demos/bombs/makefile.bcc		patch \| blob \| blame \| history
demos/bombs/makefile.gcc		patch \| blob \| blame \| history
demos/bombs/makefile.vc		patch \| blob \| blame \| history
demos/bombs/makefile.wat		patch \| blob \| blame \| history
demos/forty/Makefile.in		patch \| blob \| blame \| history
demos/forty/forty_vc7.vcproj		patch \| blob \| blame \| history
demos/forty/forty_vc8.vcproj		patch \| blob \| blame \| history
demos/forty/makefile.bcc		patch \| blob \| blame \| history
demos/forty/makefile.gcc		patch \| blob \| blame \| history
demos/forty/makefile.vc		patch \| blob \| blame \| history
demos/forty/makefile.wat		patch \| blob \| blame \| history
demos/fractal/Makefile.in		patch \| blob \| blame \| history
demos/fractal/fractal_vc7.vcproj		patch \| blob \| blame \| history
demos/fractal/fractal_vc8.vcproj		patch \| blob \| blame \| history
demos/fractal/makefile.bcc		patch \| blob \| blame \| history
demos/fractal/makefile.gcc		patch \| blob \| blame \| history
demos/fractal/makefile.vc		patch \| blob \| blame \| history
demos/fractal/makefile.wat		patch \| blob \| blame \| history
demos/life/Makefile.in		patch \| blob \| blame \| history
demos/life/life_vc7.vcproj		patch \| blob \| blame \| history
demos/life/life_vc8.vcproj		patch \| blob \| blame \| history
demos/life/makefile.bcc		patch \| blob \| blame \| history
demos/life/makefile.gcc		patch \| blob \| blame \| history
demos/life/makefile.vc		patch \| blob \| blame \| history
demos/life/makefile.wat		patch \| blob \| blame \| history
demos/makefile.bcc		patch \| blob \| blame \| history
demos/makefile.gcc		patch \| blob \| blame \| history
demos/makefile.vc		patch \| blob \| blame \| history
demos/makefile.wat		patch \| blob \| blame \| history
demos/poem/Makefile.in		patch \| blob \| blame \| history
demos/poem/makefile.bcc		patch \| blob \| blame \| history
demos/poem/makefile.gcc		patch \| blob \| blame \| history
demos/poem/makefile.vc		patch \| blob \| blame \| history
demos/poem/makefile.wat		patch \| blob \| blame \| history
demos/poem/poem_vc7.vcproj		patch \| blob \| blame \| history
demos/poem/poem_vc8.vcproj		patch \| blob \| blame \| history
utils/emulator/src/Makefile.in		patch \| blob \| blame \| history
utils/emulator/src/emulator_vc7.vcproj		patch \| blob \| blame \| history
utils/emulator/src/emulator_vc8.vcproj		patch \| blob \| blame \| history
utils/emulator/src/makefile.bcc		patch \| blob \| blame \| history
utils/emulator/src/makefile.gcc		patch \| blob \| blame \| history
utils/emulator/src/makefile.vc		patch \| blob \| blame \| history
utils/emulator/src/makefile.wat		patch \| blob \| blame \| history
utils/helpview/src/Makefile.in		patch \| blob \| blame \| history
utils/helpview/src/helpview_vc7.vcproj		patch \| blob \| blame \| history
utils/helpview/src/helpview_vc8.vcproj		patch \| blob \| blame \| history
utils/helpview/src/makefile.bcc		patch \| blob \| blame \| history
utils/helpview/src/makefile.gcc		patch \| blob \| blame \| history
utils/helpview/src/makefile.vc		patch \| blob \| blame \| history
utils/helpview/src/makefile.wat		patch \| blob \| blame \| history
utils/hhp2cached/Makefile.in		patch \| blob \| blame \| history
utils/hhp2cached/hhp2cached_vc7.vcproj		patch \| blob \| blame \| history
utils/hhp2cached/hhp2cached_vc8.vcproj		patch \| blob \| blame \| history
utils/hhp2cached/makefile.bcc		patch \| blob \| blame \| history
utils/hhp2cached/makefile.gcc		patch \| blob \| blame \| history
utils/hhp2cached/makefile.vc		patch \| blob \| blame \| history
utils/hhp2cached/makefile.wat		patch \| blob \| blame \| history
utils/ifacecheck/src/Makefile.in		patch \| blob \| blame \| history
utils/ifacecheck/src/ifacecheck.dsp		patch \| blob \| blame \| history
utils/ifacecheck/src/ifacecheck_vc7.vcproj		patch \| blob \| blame \| history
utils/ifacecheck/src/ifacecheck_vc8.vcproj		patch \| blob \| blame \| history
utils/ifacecheck/src/makefile.bcc		patch \| blob \| blame \| history
utils/ifacecheck/src/makefile.gcc		patch \| blob \| blame \| history
utils/ifacecheck/src/makefile.vc		patch \| blob \| blame \| history
utils/ifacecheck/src/makefile.wat		patch \| blob \| blame \| history
utils/wxrc/Makefile.in		patch \| blob \| blame \| history
utils/wxrc/makefile.bcc		patch \| blob \| blame \| history
utils/wxrc/makefile.gcc		patch \| blob \| blame \| history
utils/wxrc/makefile.vc		patch \| blob \| blame \| history
utils/wxrc/makefile.wat		patch \| blob \| blame \| history
utils/wxrc/wxrc_vc7.vcproj		patch \| blob \| blame \| history
utils/wxrc/wxrc_vc8.vcproj		patch \| blob \| blame \| history