Rebaked everything with bakefile 0.2.6 after wxRibbon merge.

author Vadim Zeitlin <vadim@wxwidgets.org>

Wed, 16 Sep 2009 13:07:10 +0000 (13:07 +0000)

committer Vadim Zeitlin <vadim@wxwidgets.org>

Wed, 16 Sep 2009 13:07:10 +0000 (13:07 +0000)
author Vadim Zeitlin <vadim@wxwidgets.org>
Wed, 16 Sep 2009 13:07:10 +0000 (13:07 +0000)
committer Vadim Zeitlin <vadim@wxwidgets.org>
Wed, 16 Sep 2009 13:07:10 +0000 (13:07 +0000)
diff --git a/Makefile.in b/Makefile.in

index 02e0bb548e8b850d3f45c63bde3177e1c09516ab..f268a8cfe6480b884f8e2a1b29f5a10a82559536 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1731,11 +1731,11 @@ AUILIB_OBJECTS =  \
         auilib_tabmdi.o
  AUILIB_ODEP =  $(_____pch_wxprec_auilib_wx_wxprec_h_gch___depname)
  RIBBONDLL_CXXFLAGS = $(__ribbondll_PCH_INC) -D__WX$(TOOLKIT)__ \
         auilib_tabmdi.o
  AUILIB_ODEP =  $(_____pch_wxprec_auilib_wx_wxprec_h_gch___depname)
  RIBBONDLL_CXXFLAGS = $(__ribbondll_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_RIBBON $(PIC_FLAG) \
-       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_RIBBON \
+       $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  RIBBONDLL_OBJECTS =  \
         $(__ribbondll___win32rc) \
         ribbondll_art_internal.o \
  RIBBONDLL_OBJECTS =  \
         $(__ribbondll___win32rc) \
         ribbondll_art_internal.o \
@@ -1750,10 +1750,10 @@ RIBBONDLL_OBJECTS =  \
         ribbondll_toolbar.o
  RIBBONDLL_ODEP =  $(_____pch_wxprec_ribbondll_wx_wxprec_h_gch___depname)
  RIBBONLIB_CXXFLAGS = $(__ribbonlib_PCH_INC) -D__WX$(TOOLKIT)__ \
         ribbondll_toolbar.o
  RIBBONDLL_ODEP =  $(_____pch_wxprec_ribbondll_wx_wxprec_h_gch___depname)
  RIBBONLIB_CXXFLAGS = $(__ribbonlib_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  RIBBONLIB_OBJECTS =  \
         ribbonlib_art_internal.o \
         ribbonlib_art_msw.o \
  RIBBONLIB_OBJECTS =  \
         ribbonlib_art_internal.o \
         ribbonlib_art_msw.o \
@@ -11501,7 +11501,7 @@ COND_WINDOWS_IMPLIB_1___ribbondll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__ribbondll___importlib = $(COND_WINDOWS_IMPLIB_1___ribbondll___importlib)
  @COND_GCC_PCH_1@__ribbondll_PCH_INC = -I./.pch/wxprec_ribbondll
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__ribbondll___importlib = $(COND_WINDOWS_IMPLIB_1___ribbondll___importlib)
  @COND_GCC_PCH_1@__ribbondll_PCH_INC = -I./.pch/wxprec_ribbondll
-@COND_ICC_PCH_1@__ribbondll_PCH_INC = -use_pch \
+@COND_ICC_PCH_1@__ribbondll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
  @COND_ICC_PCH_1@       ./.pch/wxprec_ribbondll/wx/wxprec.h.gch
  @COND_USE_PCH_1@_____pch_wxprec_ribbondll_wx_wxprec_h_gch___depname \
  @COND_USE_PCH_1@       = ./.pch/wxprec_ribbondll/wx/wxprec.h.gch
  @COND_ICC_PCH_1@       ./.pch/wxprec_ribbondll/wx/wxprec.h.gch
  @COND_USE_PCH_1@_____pch_wxprec_ribbondll_wx_wxprec_h_gch___depname \
  @COND_USE_PCH_1@       = ./.pch/wxprec_ribbondll/wx/wxprec.h.gch
@@ -11544,7 +11544,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1___ribbonlib___depname = \
  @COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@__uninstall_ribbonlib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@      = uninstall_ribbonlib
  @COND_GCC_PCH_1@__ribbonlib_PCH_INC = -I./.pch/wxprec_ribbonlib
  @COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@__uninstall_ribbonlib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@      = uninstall_ribbonlib
  @COND_GCC_PCH_1@__ribbonlib_PCH_INC = -I./.pch/wxprec_ribbonlib
-@COND_ICC_PCH_1@__ribbonlib_PCH_INC = -use_pch \
+@COND_ICC_PCH_1@__ribbonlib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
  @COND_ICC_PCH_1@       ./.pch/wxprec_ribbonlib/wx/wxprec.h.gch
  @COND_USE_PCH_1@_____pch_wxprec_ribbonlib_wx_wxprec_h_gch___depname \
  @COND_USE_PCH_1@       = ./.pch/wxprec_ribbonlib/wx/wxprec.h.gch
  @COND_ICC_PCH_1@       ./.pch/wxprec_ribbonlib/wx/wxprec.h.gch
  @COND_USE_PCH_1@_____pch_wxprec_ribbonlib_wx_wxprec_h_gch___depname \
  @COND_USE_PCH_1@       = ./.pch/wxprec_ribbonlib/wx/wxprec.h.gch
@@ -12601,11 +12601,11 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
         = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_LIBR_0 = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0)
         = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_LIBR_0 = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_58 = --define __WXUNIVERSAL__
-@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_57 = --define wxDEBUG_LEVEL=0
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_57 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_57 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_57 = --define wxNO_THREADS
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_62 = --define __WXUNIVERSAL__
+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_61 = --define wxDEBUG_LEVEL=0
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_61 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_61 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_61 = --define wxNO_THREADS
  @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).1
  @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .1.$(SO_SUFFIX)
  @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
  @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).1
  @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .1.$(SO_SUFFIX)
  @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
@@ -18938,7 +18938,7 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
  monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
  monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_BASE=1 --define WXMAKINGDLL --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_BASE=1 --define WXMAKINGDLL --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS
  
  monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
  
  monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
@@ -23675,7 +23675,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
  basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
  basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1
  
  basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
  
  basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
@@ -24620,7 +24620,7 @@ baselib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASELIB_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
  netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
  netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET
  
  netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETDLL_ODEP)
         $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
  
  netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETDLL_ODEP)
         $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
@@ -24737,7 +24737,7 @@ netlib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(NETLIB_ODEP)
  @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
  
  coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP)
  @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
  
  coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0
  
  coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp
  
  coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp
@@ -31796,7 +31796,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
  
  advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
  
  advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_ADV
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_ADV
  
  advdll_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
  
  advdll_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
@@ -32447,7 +32447,7 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
  
  mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP)
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
  
  mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA
  
  mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
         $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
  
  mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
         $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
@@ -32522,7 +32522,7 @@ medialib_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIALIB_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_HTML
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_HTML
  
  htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(HTMLDLL_ODEP)
         $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
  
  htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(HTMLDLL_ODEP)
         $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
@@ -32681,7 +32681,7 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
  qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
  qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_QA
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_QA
  
  qadll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(QADLL_ODEP)
         $(CXXC) -c -o $@ $(QADLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
  
  qadll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(QADLL_ODEP)
         $(CXXC) -c -o $@ $(QADLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
@@ -32696,7 +32696,7 @@ qalib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(QALIB_ODEP)
         $(CXXC) -c -o $@ $(QALIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
  
  xmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(XMLDLL_ODEP)
         $(CXXC) -c -o $@ $(QALIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
  
  xmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(XMLDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML
  
  xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(XMLDLL_ODEP)
         $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
  
  xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(XMLDLL_ODEP)
         $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
@@ -32711,7 +32711,7 @@ xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(XMLLIB_ODEP)
         $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp
  
  xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp
  
  xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_XRC
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_XRC
  
  xrcdll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
  
  xrcdll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
@@ -33080,7 +33080,7 @@ xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
  
  auidll_version_rc.o: $(srcdir)/src/msw/version.rc $(AUIDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
  
  auidll_version_rc.o: $(srcdir)/src/msw/version.rc $(AUIDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_AUI
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_AUI
  
  auidll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUIDLL_ODEP)
         $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp
  
  auidll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUIDLL_ODEP)
         $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp
@@ -33119,7 +33119,7 @@ auilib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUILIB_ODEP)
         $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
  
  ribbondll_version_rc.o: $(srcdir)/src/msw/version.rc $(RIBBONDLL_ODEP)
         $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
  
  ribbondll_version_rc.o: $(srcdir)/src/msw/version.rc $(RIBBONDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_RIBBON
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_RIBBON
  
  ribbondll_art_internal.o: $(srcdir)/src/ribbon/art_internal.cpp $(RIBBONDLL_ODEP)
         $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/art_internal.cpp
  
  ribbondll_art_internal.o: $(srcdir)/src/ribbon/art_internal.cpp $(RIBBONDLL_ODEP)
         $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/art_internal.cpp
@@ -33182,7 +33182,7 @@ ribbonlib_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(RIBBONLIB_ODEP)
         $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp
  
  propgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(PROPGRIDDLL_ODEP)
         $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp
  
  propgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(PROPGRIDDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID
  
  propgriddll_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(PROPGRIDDLL_ODEP)
         $(CXXC) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp
  
  propgriddll_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(PROPGRIDDLL_ODEP)
         $(CXXC) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp
@@ -33233,7 +33233,7 @@ propgridlib_props.o: $(srcdir)/src/propgrid/props.cpp $(PROPGRIDLIB_ODEP)
         $(CXXC) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(srcdir)/src/propgrid/props.cpp
  
  richtextdll_version_rc.o: $(srcdir)/src/msw/version.rc $(RICHTEXTDLL_ODEP)
         $(CXXC) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(srcdir)/src/propgrid/props.cpp
  
  richtextdll_version_rc.o: $(srcdir)/src/msw/version.rc $(RICHTEXTDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT
  
  richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
  
  richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
@@ -33290,7 +33290,7 @@ richtextlib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXT
         $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
  
  stcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(STCDLL_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
  
  stcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(STCDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC
  
  stcdll_stc.o: $(srcdir)/src/stc/stc.cpp $(STCDLL_ODEP)
         $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
  
  stcdll_stc.o: $(srcdir)/src/stc/stc.cpp $(STCDLL_ODEP)
         $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
@@ -33311,7 +33311,7 @@ stclib_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(STCLIB_ODEP)
         $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp
  
  gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP)
         $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp
  
  gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_GL
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_GL
  
  gldll_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLDLL_ODEP)
         $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp
  
  gldll_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLDLL_ODEP)
         $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp
diff --git a/autoconf_inc.m4 b/autoconf_inc.m4

index 00bdd26e79a37260a0d3ddb69ca9ef7c6394276a..27c09787c4ea7c54292e2557ee37fd543fc6c0dc 100644 (file)
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -68,7 +68,7 @@ dnl ### begin block 20_COND_BUILD_debug[../../demos/bombs/bombs.bkl,../../demos/
          COND_BUILD_debug=""
      fi
      AC_SUBST(COND_BUILD_debug)
          COND_BUILD_debug=""
      fi
      AC_SUBST(COND_BUILD_debug)
-dnl ### begin block 20_COND_BUILD_debug_DEBUG_FLAG_default[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl,../../utils/execmon/execmon.bkl] ###
+dnl ### begin block 20_COND_BUILD_debug_DEBUG_FLAG_default[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl] ###
      COND_BUILD_debug_DEBUG_FLAG_default="#"
      if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
          COND_BUILD_debug_DEBUG_FLAG_default=""
      COND_BUILD_debug_DEBUG_FLAG_default="#"
      if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
          COND_BUILD_debug_DEBUG_FLAG_default=""
@@ -80,13 +80,13 @@ dnl ### begin block 20_COND_BUILD_debug_DEBUG_INFO_default[../../demos/bombs/bom
          COND_BUILD_debug_DEBUG_INFO_default=""
      fi
      AC_SUBST(COND_BUILD_debug_DEBUG_INFO_default)
          COND_BUILD_debug_DEBUG_INFO_default=""
      fi
      AC_SUBST(COND_BUILD_debug_DEBUG_INFO_default)
-dnl ### begin block 20_COND_BUILD_debug_UNICODE_0[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl,../../utils/execmon/execmon.bkl] ###
+dnl ### begin block 20_COND_BUILD_debug_UNICODE_0[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl] ###
      COND_BUILD_debug_UNICODE_0="#"
      if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
          COND_BUILD_debug_UNICODE_0=""
      fi
      AC_SUBST(COND_BUILD_debug_UNICODE_0)
      COND_BUILD_debug_UNICODE_0="#"
      if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
          COND_BUILD_debug_UNICODE_0=""
      fi
      AC_SUBST(COND_BUILD_debug_UNICODE_0)
-dnl ### begin block 20_COND_BUILD_debug_UNICODE_1[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl,../../utils/execmon/execmon.bkl] ###
+dnl ### begin block 20_COND_BUILD_debug_UNICODE_1[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl] ###
      COND_BUILD_debug_UNICODE_1="#"
      if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
          COND_BUILD_debug_UNICODE_1=""
      COND_BUILD_debug_UNICODE_1="#"
      if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
          COND_BUILD_debug_UNICODE_1=""
@@ -104,25 +104,25 @@ dnl ### begin block 20_COND_BUILD_release_DEBUG_INFO_default[../../demos/bombs/b
          COND_BUILD_release_DEBUG_INFO_default=""
      fi
      AC_SUBST(COND_BUILD_release_DEBUG_INFO_default)
          COND_BUILD_release_DEBUG_INFO_default=""
      fi
      AC_SUBST(COND_BUILD_release_DEBUG_INFO_default)
-dnl ### begin block 20_COND_BUILD_release_UNICODE_0[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl,../../utils/execmon/execmon.bkl] ###
+dnl ### begin block 20_COND_BUILD_release_UNICODE_0[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl] ###
      COND_BUILD_release_UNICODE_0="#"
      if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
          COND_BUILD_release_UNICODE_0=""
      fi
      AC_SUBST(COND_BUILD_release_UNICODE_0)
      COND_BUILD_release_UNICODE_0="#"
      if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
          COND_BUILD_release_UNICODE_0=""
      fi
      AC_SUBST(COND_BUILD_release_UNICODE_0)
-dnl ### begin block 20_COND_BUILD_release_UNICODE_1[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl,../../utils/execmon/execmon.bkl] ###
+dnl ### begin block 20_COND_BUILD_release_UNICODE_1[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl] ###
      COND_BUILD_release_UNICODE_1="#"
      if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
          COND_BUILD_release_UNICODE_1=""
      fi
      AC_SUBST(COND_BUILD_release_UNICODE_1)
      COND_BUILD_release_UNICODE_1="#"
      if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
          COND_BUILD_release_UNICODE_1=""
      fi
      AC_SUBST(COND_BUILD_release_UNICODE_1)
-dnl ### begin block 20_COND_DEBUG_FLAG_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_FLAG_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
      COND_DEBUG_FLAG_0="#"
      if test "x$DEBUG_FLAG" = "x0" ; then
          COND_DEBUG_FLAG_0=""
      fi
      AC_SUBST(COND_DEBUG_FLAG_0)
      COND_DEBUG_FLAG_0="#"
      if test "x$DEBUG_FLAG" = "x0" ; then
          COND_DEBUG_FLAG_0=""
      fi
      AC_SUBST(COND_DEBUG_FLAG_0)
-dnl ### begin block 20_COND_DEBUG_FLAG_1[../../samples/docvwmdi/docvwmdi.bkl,../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/execmon/execmon.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+dnl ### begin block 20_COND_DEBUG_FLAG_1[../../samples/docvwmdi/docvwmdi.bkl,../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
      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=""
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc

index a7cb8fb5bec57da105ac682690c7bfd66c6f6f05..43bb7deb4b4c3de769b1ba30f45a9774b4a0f806 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -4179,7 +4179,7 @@ __RUNTIME_LIBS_5 =
  __WXUNIV_DEFINE_p_62 = -d__WXUNIVERSAL__
  !endif
  !if "$(DEBUG_FLAG)" == "0"
  __WXUNIV_DEFINE_p_62 = -d__WXUNIVERSAL__
  !endif
  !if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_57 = -dwxDEBUG_LEVEL=0
+__DEBUG_DEFINE_p_61 = -dwxDEBUG_LEVEL=0
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
  __EXCEPTIONS_DEFINE_p_61 = -dwxNO_EXCEPTIONS
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
  __EXCEPTIONS_DEFINE_p_61 = -dwxNO_EXCEPTIONS
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc

index 3aa540460c0b3ad2ca177836e12071e3c0cba7a9..879b876c54d6f13fa861a021b410201af689a527 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -4335,7 +4335,7 @@ ifeq ($(WXUNIV),1)
  __WXUNIV_DEFINE_p_62 = --define __WXUNIVERSAL__
  endif
  ifeq ($(DEBUG_FLAG),0)
  __WXUNIV_DEFINE_p_62 = --define __WXUNIVERSAL__
  endif
  ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p_57 = --define wxDEBUG_LEVEL=0
+__DEBUG_DEFINE_p_61 = --define wxDEBUG_LEVEL=0
  endif
  ifeq ($(USE_EXCEPTIONS),0)
  __EXCEPTIONS_DEFINE_p_61 = --define wxNO_EXCEPTIONS
  endif
  ifeq ($(USE_EXCEPTIONS),0)
  __EXCEPTIONS_DEFINE_p_61 = --define wxNO_EXCEPTIONS
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc

index b8233ccfd1303fbd9067615da8270893703661f3..39466ed547720b754e77b62eb49148869aab21fd 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -4574,7 +4574,7 @@ __NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__
  __WXUNIV_DEFINE_p_62 = /d __WXUNIVERSAL__
  !endif
  !if "$(DEBUG_FLAG)" == "0"
  __WXUNIV_DEFINE_p_62 = /d __WXUNIVERSAL__
  !endif
  !if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_57 = /d wxDEBUG_LEVEL=0
+__DEBUG_DEFINE_p_61 = /d wxDEBUG_LEVEL=0
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
  __EXCEPTIONS_DEFINE_p_61 = /d wxNO_EXCEPTIONS
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
  __EXCEPTIONS_DEFINE_p_61 = /d wxNO_EXCEPTIONS
diff --git a/build/msw/wx_ribbon.dsp b/build/msw/wx_ribbon.dsp

index 820dd6a30e2419a8688897fc898d98d0222390ce..e605682d4832dc928cbc9483294eb74f6626bbef 100644 (file)
--- a/build/msw/wx_ribbon.dsp
+++ b/build/msw/wx_ribbon.dsp
@@ -47,18 +47,18 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\ribbon"\r
  # PROP Target_Dir ""\r
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\ribbon"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
  LINK32=link.exe\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
  LINK32=link.exe\r
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.pdb"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.pdb"\r
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb"\r
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb"\r
  \r
  !ELSEIF  "$(CFG)" == "ribbon - Win32 DLL Universal Debug"\r
  \r
  \r
  !ELSEIF  "$(CFG)" == "ribbon - Win32 DLL Universal Debug"\r
  \r
@@ -72,18 +72,18 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\ribbon"\r
  # PROP Target_Dir ""\r
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\ribbon"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
-# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
  LINK32=link.exe\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
  LINK32=link.exe\r
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.pdb"\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.pdb"\r
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb"\r
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb"\r
  \r
  !ELSEIF  "$(CFG)" == "ribbon - Win32 DLL Release"\r
  \r
  \r
  !ELSEIF  "$(CFG)" == "ribbon - Win32 DLL Release"\r
  \r
@@ -97,18 +97,18 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\ribbon"\r
  # PROP Target_Dir ""\r
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\ribbon"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
  # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
  # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
  LINK32=link.exe\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
  LINK32=link.exe\r
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.pdb"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.pdb"\r
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb"\r
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb"\r
  \r
  !ELSEIF  "$(CFG)" == "ribbon - Win32 DLL Debug"\r
  \r
  \r
  !ELSEIF  "$(CFG)" == "ribbon - Win32 DLL Debug"\r
  \r
@@ -122,18 +122,18 @@ LINK32=link.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\ribbon"\r
  # PROP Target_Dir ""\r
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\ribbon"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
-# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
  LINK32=link.exe\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
  LINK32=link.exe\r
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.pdb"\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.pdb"\r
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb"\r
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb"\r
  \r
  !ELSEIF  "$(CFG)" == "ribbon - Win32 Universal Release"\r
  \r
  \r
  !ELSEIF  "$(CFG)" == "ribbon - Win32 Universal Release"\r
  \r
@@ -170,8 +170,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\ribbon"\r
  # PROP Target_Dir ""\r
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\ribbon"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -216,8 +216,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\ribbon"\r
  # PROP Target_Dir ""\r
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\ribbon"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_vc7.sln b/build/msw/wx_vc7.sln

index b0cdeaa3301412830ef901a71bb19b8467dde645..0ead2a9fd8961e6bcc0a66669f4ee12503f2946d 100644 (file)
--- a/build/msw/wx_vc7.sln
+++ b/build/msw/wx_vc7.sln
@@ -330,6 +330,22 @@ Global
                 {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
                 {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
                 {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
                 {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
                 {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
                 {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Debug|Win32.Build.0 = Debug|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Release|Win32.ActiveCfg = Release|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Release|Win32.Build.0 = Release|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
+               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Debug|Win32.Build.0 = Debug|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Release|Win32.ActiveCfg = Release|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Debug|Win32.Build.0 = Debug|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Release|Win32.ActiveCfg = Release|Win32\r
@@ -344,22 +360,6 @@ Global
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Release|Win32.ActiveCfg = Release|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Release|Win32.Build.0 = Release|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Debug|Win32.Build.0 = Debug|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
                 {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
                 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
                 {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Debug|Win32.ActiveCfg = Debug|Win32\r
diff --git a/build/msw/wx_vc7_ribbon.vcproj b/build/msw/wx_vc7_ribbon.vcproj

index 35d9fb3db384294390e422b9736185274716ccc2..a0c106f9f49b356c861737f9f484b94c04e053f8 100644 (file)
--- a/build/msw/wx_vc7_ribbon.vcproj
+++ b/build/msw/wx_vc7_ribbon.vcproj
@@ -1,8 +1,8 @@
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
-  This makefile was generated by\r
-  Bakefile 0.2.5 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.6 (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
@@ -17,27 +17,86 @@
         </Platforms>\r
         <Configurations>\r
                 <Configuration\r
         </Platforms>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\ribbon"\r
-                       ConfigurationType="2"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\ribbon"\r
+                       ConfigurationType="4"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               UsePrecompiledHeader="3"\r
+                               PrecompiledHeaderThrough="wx/wxprec.h"\r
+                               PrecompiledHeaderFile="vc_mswud\wxprec_ribbonlib.pch"\r
+                               ObjectFile="vc_mswud\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_ribbon.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\ribbon"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_ribbondll.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\ribbon\"\r
-                               ObjectFile="vc_mswunivudll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\wxprec_ribbonlib.pch"\r
+                               ObjectFile="vc_mswu\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -45,19 +104,13 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29u_ribbon.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -66,9 +119,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -81,18 +134,18 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\ribbon"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\ribbon"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
@@ -101,10 +154,9 @@
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_ribbondll.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\ribbon\"\r
-                               ObjectFile="vc_mswunivuddll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\wxprec_ribbonlib.pch"\r
+                               ObjectFile="vc_mswunivud\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -112,19 +164,13 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_ribbon.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -133,9 +179,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -148,27 +194,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\ribbon"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivu\ribbon"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"\r
-                               AssemblerListingLocation="vc_mswudll\ribbon\"\r
-                               ObjectFile="vc_mswudll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\wxprec_ribbonlib.pch"\r
+                               ObjectFile="vc_mswunivu\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -176,19 +221,13 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_ribbon.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -197,9 +236,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -223,7 +262,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
@@ -233,9 +272,8 @@
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\ribbon\"\r
                                 ObjectFile="vc_mswuddll\ribbon\"\r
                                 ObjectFile="vc_mswuddll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -246,16 +284,18 @@
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                                 AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                                 AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.dll"\r
                                 LinkIncremental="2"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_ribbon.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 LinkIncremental="2"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_ribbon.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -264,7 +304,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
@@ -279,27 +319,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\ribbon"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\ribbon"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_ribbonlib.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\ribbon\"\r
-                               ObjectFile="vc_mswunivu\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_ribbon.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"\r
+                               ObjectFile="vc_mswudll\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -307,11 +346,21 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_ribbon.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb"\r
+                               TargetMachine="1"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -320,9 +369,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -335,18 +384,18 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\ribbon"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\ribbon"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
@@ -355,10 +404,9 @@
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\wxprec_ribbonlib.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\ribbon\"\r
-                               ObjectFile="vc_mswunivud\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_ribbondll.pch"\r
+                               ObjectFile="vc_mswunivuddll\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -366,11 +414,21 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_ribbon.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb"\r
+                               TargetMachine="1"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -379,9 +437,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -394,27 +452,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\ribbon"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivudll\ribbon"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\wxprec_ribbonlib.pch"\r
-                               AssemblerListingLocation="vc_mswu\ribbon\"\r
-                               ObjectFile="vc_mswu\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_ribbon.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_ribbondll.pch"\r
+                               ObjectFile="vc_mswunivudll\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -422,70 +479,21 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29u_ribbon.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\ribbon"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
-                       CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               UsePrecompiledHeader="3"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\wxprec_ribbonlib.pch"\r
-                               AssemblerListingLocation="vc_mswud\ribbon\"\r
-                               ObjectFile="vc_mswud\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb"\r
-                               WarningLevel="4"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_ribbon.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb"\r
+                               TargetMachine="1"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -494,9 +502,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -519,49 +527,49 @@
                         <File\r
                                 RelativePath="..\..\src\common\dummy.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\common\dummy.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32">\r
+                                       Name="Universal Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32">\r
+                                       Name="DLL Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="DLL Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
@@ -574,16 +582,16 @@
                         <File\r
                                 RelativePath="..\..\src\msw\version.rc">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\version.rc">\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                 </Filter>\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                 </Filter>\r
@@ -593,96 +601,96 @@
                         <File\r
                                 RelativePath="..\..\include\wx\univ\setup.h">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\setup.h">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="Debug|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Universal Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32">\r
+                                       Name="DLL Release|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Universal Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\setup.h">\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\setup.h">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32">\r
+                                       Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Universal Release|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
                                 </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"/>\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
@@ -691,40 +699,31 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32">\r
+                                       Name="Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32">\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32">\r
@@ -736,31 +735,40 @@
                                                 AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>\r
                                 </FileConfiguration>\r
                         </File>\r
                 </Filter>\r
                                 </FileConfiguration>\r
                         </File>\r
                 </Filter>\r
diff --git a/build/msw/wx_vc8.sln b/build/msw/wx_vc8.sln

index 1be08934340418f32b00bf0d2812a3308840c4a8..303e7976c9702d382c4fafbaef053b69f040be6d 100644 (file)
--- a/build/msw/wx_vc8.sln
+++ b/build/msw/wx_vc8.sln
@@ -331,6 +331,22 @@ Global
                 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
                 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
                 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
                 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
                 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
                 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Debug|Win32.Build.0 = Debug|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Release|Win32.ActiveCfg = Release|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Release|Win32.Build.0 = Release|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
+               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|Win32.Build.0 = Debug|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.Release|Win32.ActiveCfg = Release|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|Win32.Build.0 = Debug|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.Release|Win32.ActiveCfg = Release|Win32\r
@@ -345,22 +361,6 @@ Global
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Release|Win32.ActiveCfg = Release|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Release|Win32.Build.0 = Release|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Debug|Win32.Build.0 = Debug|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
                 {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
                 {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
                 {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Debug|Win32.ActiveCfg = Debug|Win32\r
diff --git a/build/msw/wx_vc8_ribbon.vcproj b/build/msw/wx_vc8_ribbon.vcproj

index 0dd8bf155bc7f7dea25dc90f1852b2a83a8737f2..f6132b324ab78e2b8a360ea287521e022d968c34 100644 (file)
--- a/build/msw/wx_vc8_ribbon.vcproj
+++ b/build/msw/wx_vc8_ribbon.vcproj
@@ -1,8 +1,8 @@
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
-  This makefile was generated by\r
-  Bakefile 0.2.5 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.6 (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,10 +22,10 @@
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\ribbon"\r
-                       ConfigurationType="2"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\ribbon"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -44,21 +44,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_ribbondll.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\ribbon\"\r
-                               ObjectFile="vc_mswunivudll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\wxprec_ribbonlib.pch"\r
+                               ObjectFile="vc_mswud\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -69,26 +73,17 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -101,7 +96,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -112,10 +107,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\ribbon"\r
-                       ConfigurationType="2"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\ribbon"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -134,24 +129,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_ribbondll.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\ribbon\"\r
-                               ObjectFile="vc_mswunivuddll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\wxprec_ribbonlib.pch"\r
+                               ObjectFile="vc_mswu\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -162,26 +155,17 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29u_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -194,7 +178,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -205,10 +189,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\ribbon"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\ribbon"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -227,21 +211,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"\r
-                               AssemblerListingLocation="vc_mswudll\ribbon\"\r
-                               ObjectFile="vc_mswudll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\wxprec_ribbonlib.pch"\r
+                               ObjectFile="vc_mswunivud\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -252,26 +240,17 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -284,7 +263,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -295,10 +274,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswuddll\ribbon"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivu\ribbon"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -317,24 +296,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\ribbon\"\r
-                               ObjectFile="vc_mswuddll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\wxprec_ribbonlib.pch"\r
+                               ObjectFile="vc_mswunivu\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -345,26 +322,17 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_ribbon.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -377,7 +345,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -388,10 +356,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\ribbon"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswuddll\ribbon"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -410,21 +378,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_ribbonlib.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\ribbon\"\r
-                               ObjectFile="vc_mswunivu\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_ribbon.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"\r
+                               ObjectFile="vc_mswuddll\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -435,17 +407,26 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_ribbon.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb"\r
+                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -458,7 +439,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -469,10 +450,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\ribbon"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\ribbon"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -491,24 +472,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\wxprec_ribbonlib.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\ribbon\"\r
-                               ObjectFile="vc_mswunivud\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"\r
+                               ObjectFile="vc_mswudll\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -519,17 +498,26 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_ribbon.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb"\r
+                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -542,7 +530,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -553,10 +541,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\ribbon"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\ribbon"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -575,21 +563,25 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\wxprec_ribbonlib.pch"\r
-                               AssemblerListingLocation="vc_mswu\ribbon\"\r
-                               ObjectFile="vc_mswu\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_ribbon.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_ribbondll.pch"\r
+                               ObjectFile="vc_mswunivuddll\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -600,17 +592,26 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29u_ribbon.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb"\r
+                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -623,7 +624,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -634,10 +635,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\ribbon"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivudll\ribbon"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -656,24 +657,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\wxprec_ribbonlib.pch"\r
-                               AssemblerListingLocation="vc_mswud\ribbon\"\r
-                               ObjectFile="vc_mswud\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_ribbondll.pch"\r
+                               ObjectFile="vc_mswunivudll\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -684,17 +683,26 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_ribbon.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb"\r
+                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -707,7 +715,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -730,7 +738,7 @@
                                 RelativePath="..\..\src\common\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\common\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -738,7 +746,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -746,7 +754,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -754,7 +762,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -762,7 +770,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -770,7 +778,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -778,7 +786,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -786,7 +794,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -803,19 +811,19 @@
                                 RelativePath="..\..\src\msw\version.rc"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\msw\version.rc"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -828,121 +836,121 @@
                                 RelativePath="..\..\include\wx\univ\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\include\wx\univ\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                               />\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
@@ -953,91 +961,91 @@
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                         </File>\r
                                         />\r
                                 </FileConfiguration>\r
                         </File>\r
diff --git a/build/msw/wx_vc9.sln b/build/msw/wx_vc9.sln

index 357899e87000877bbbaadb19db40928f6d05da7f..ce990249436396e3db4bb59cec794ed3531b3fe4 100644 (file)
--- a/build/msw/wx_vc9.sln
+++ b/build/msw/wx_vc9.sln
@@ -331,6 +331,22 @@ Global
                 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
                 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
                 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
                 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
                 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
                 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
+               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.Build.0 = Debug|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.Build.0 = Debug|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32\r
@@ -345,22 +361,6 @@ Global
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
                 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
                 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
                 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32\r
diff --git a/build/msw/wx_vc9_ribbon.vcproj b/build/msw/wx_vc9_ribbon.vcproj

index 71b73ae6adb90d3c17640210a439d6b4179d3b9e..e549271b251fc6ac56c85bd909afe4ed17f104b4 100644 (file)
--- a/build/msw/wx_vc9_ribbon.vcproj
+++ b/build/msw/wx_vc9_ribbon.vcproj
@@ -1,8 +1,8 @@
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
-  This makefile was generated by\r
-  Bakefile 0.2.5 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.6 (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,10 +22,10 @@
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\ribbon"\r
-                       ConfigurationType="2"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\ribbon"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -44,22 +44,25 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_ribbondll.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\ribbon\"\r
-                               ObjectFile="vc_mswunivudll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\wxprec_ribbonlib.pch"\r
+                               ObjectFile="vc_mswud\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -69,26 +72,17 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -101,7 +95,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc9_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -112,10 +106,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\ribbon"\r
-                       ConfigurationType="2"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\ribbon"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -134,24 +128,23 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_ribbondll.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\ribbon\"\r
-                               ObjectFile="vc_mswunivuddll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\wxprec_ribbonlib.pch"\r
+                               ObjectFile="vc_mswu\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -161,26 +154,17 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29u_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -193,7 +177,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc9_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -204,10 +188,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\ribbon"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\ribbon"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -226,22 +210,25 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"\r
-                               AssemblerListingLocation="vc_mswudll\ribbon\"\r
-                               ObjectFile="vc_mswudll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\wxprec_ribbonlib.pch"\r
+                               ObjectFile="vc_mswunivud\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -251,26 +238,17 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -283,7 +261,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc9_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -294,10 +272,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswuddll\ribbon"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivu\ribbon"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -316,24 +294,23 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\ribbon\"\r
-                               ObjectFile="vc_mswuddll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\wxprec_ribbonlib.pch"\r
+                               ObjectFile="vc_mswunivu\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -343,26 +320,17 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_ribbon.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -375,7 +343,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc9_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -386,10 +354,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\ribbon"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswuddll\ribbon"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -408,22 +376,25 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_ribbonlib.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\ribbon\"\r
-                               ObjectFile="vc_mswunivu\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_ribbon.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"\r
+                               ObjectFile="vc_mswuddll\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -433,17 +404,26 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_ribbon.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb"\r
+                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -456,7 +436,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc9_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -467,10 +447,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\ribbon"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\ribbon"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -489,24 +469,23 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\wxprec_ribbonlib.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\ribbon\"\r
-                               ObjectFile="vc_mswunivud\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"\r
+                               ObjectFile="vc_mswudll\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -516,17 +495,26 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_ribbon.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb"\r
+                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -539,7 +527,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc9_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -550,10 +538,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\ribbon"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\ribbon"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -572,22 +560,25 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\wxprec_ribbonlib.pch"\r
-                               AssemblerListingLocation="vc_mswu\ribbon\"\r
-                               ObjectFile="vc_mswu\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_ribbon.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_ribbondll.pch"\r
+                               ObjectFile="vc_mswunivuddll\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -597,17 +588,26 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29u_ribbon.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb"\r
+                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -620,7 +620,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc9_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -631,10 +631,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\ribbon"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivudll\ribbon"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -653,24 +653,23 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\wxprec_ribbonlib.pch"\r
-                               AssemblerListingLocation="vc_mswud\ribbon\"\r
-                               ObjectFile="vc_mswud\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_ribbondll.pch"\r
+                               ObjectFile="vc_mswunivudll\ribbon\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -680,17 +679,26 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_ribbon.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb"\r
+                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -703,7 +711,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_ribbon.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc9_ribbon.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -726,7 +734,7 @@
                                 RelativePath="..\..\src\common\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\common\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -734,7 +742,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -742,7 +750,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -750,7 +758,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -758,7 +766,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -766,7 +774,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -774,7 +782,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -782,7 +790,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -799,19 +807,19 @@
                                 RelativePath="..\..\src\msw\version.rc"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\msw\version.rc"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -824,121 +832,121 @@
                                 RelativePath="..\..\include\wx\univ\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\include\wx\univ\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                                 AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                               />\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
@@ -949,91 +957,91 @@
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                         </File>\r
                                         />\r
                                 </FileConfiguration>\r
                         </File>\r
diff --git a/configure b/configure

index bebb24ce91793a8effad7bbef7344bb898724f55..8273903a77222423279012fe28fa5ad18e018f97 100755 (executable)
--- a/configure
+++ b/configure
@@ -846,6 +846,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
  COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
  COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1
+COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1
  COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
  COND_MONOLITHIC_0_SHARED_0_USE_STC_1
  COND_MONOLITHIC_0_SHARED_0_USE_XRC_1
  COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
  COND_MONOLITHIC_0_SHARED_0_USE_STC_1
  COND_MONOLITHIC_0_SHARED_0_USE_XRC_1
@@ -856,6 +857,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
  COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
  COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1
+COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1
  COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
  COND_MONOLITHIC_0_SHARED_1_USE_STC_1
  COND_MONOLITHIC_0_SHARED_1_USE_XRC_1
  COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
  COND_MONOLITHIC_0_SHARED_1_USE_STC_1
  COND_MONOLITHIC_0_SHARED_1_USE_XRC_1
@@ -866,6 +868,7 @@ COND_MONOLITHIC_0_USE_HTML_1
  COND_MONOLITHIC_0_USE_MEDIA_1
  COND_MONOLITHIC_0_USE_PROPGRID_1
  COND_MONOLITHIC_0_USE_QA_1
  COND_MONOLITHIC_0_USE_MEDIA_1
  COND_MONOLITHIC_0_USE_PROPGRID_1
  COND_MONOLITHIC_0_USE_QA_1
+COND_MONOLITHIC_0_USE_RIBBON_1
  COND_MONOLITHIC_0_USE_RICHTEXT_1
  COND_MONOLITHIC_0_USE_STC_1
  COND_MONOLITHIC_0_USE_XRC_1
  COND_MONOLITHIC_0_USE_RICHTEXT_1
  COND_MONOLITHIC_0_USE_STC_1
  COND_MONOLITHIC_0_USE_XRC_1
@@ -1761,6 +1764,7 @@ Optional Features:
    --enable-xrc            use XRC resources sub-library
    --enable-aui            use AUI docking library
    --enable-propgrid       use wxPropertyGrid library
    --enable-xrc            use XRC resources sub-library
    --enable-aui            use AUI docking library
    --enable-propgrid       use wxPropertyGrid library
+  --enable-ribbon         use wxRibbon library
    --enable-stc            use wxStyledTextCtrl library
    --enable-constraints    use layout-constraints system
    --enable-loggui         use standard GUI logger
    --enable-stc            use wxStyledTextCtrl library
    --enable-constraints    use layout-constraints system
    --enable-loggui         use standard GUI logger
@@ -4335,7 +4339,6 @@ echo "$as_me: error: Invalid --enable-debug value, must be yes, no or max" >&2;}
     { (exit 1); exit 1; }; }
          fi
  
     { (exit 1); exit 1; }; }
          fi
  
-
  else
    wxUSE_DEBUG=default
  
  else
    wxUSE_DEBUG=default
  
@@ -8610,6 +8613,50 @@ fi
  echo "${ECHO_T}$result" >&6; }
  
  
  echo "${ECHO_T}$result" >&6; }
  
  
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ribbon" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ribbon... $ECHO_C" >&6; }
+          # Check whether --enable-ribbon was given.
+if test "${enable_ribbon+set}" = set; then
+  enableval=$enable_ribbon;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_ribbon='wxUSE_RIBBON=yes'
+                          else
+                            wx_cv_use_ribbon='wxUSE_RIBBON=no'
+                          fi
+
+else
+
+                          wx_cv_use_ribbon='wxUSE_RIBBON=${'DEFAULT_wxUSE_RIBBON":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_ribbon"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_RIBBON = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_RIBBON
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
@@ -46246,6 +46293,16 @@ _ACEOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid"
  fi
  
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid"
  fi
  
+USE_RIBBON=0
+if test "$wxUSE_RIBBON" = "yes"; then
+   cat >>confdefs.h <<\_ACEOF
+#define wxUSE_RIBBON 1
+_ACEOF
+
+   USE_RIBBON=1
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ribbon"
+fi
+
  USE_STC=0
  if test "$wxUSE_STC" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
  USE_STC=0
  if test "$wxUSE_STC" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
@@ -46982,6 +47039,9 @@ if test "$wxUSE_GUI" = "yes"; then
      if test "$wxUSE_PROPGRID" = "yes" ; then
          BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
      fi
      if test "$wxUSE_PROPGRID" = "yes" ; then
          BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
      fi
+    if test "$wxUSE_RIBBON" = "yes" ; then
+        BUILT_WX_LIBS="ribbon $BUILT_WX_LIBS"
+    fi
      if test "$wxUSE_RICHTEXT" = "yes" ; then
          BUILT_WX_LIBS="richtext $BUILT_WX_LIBS"
      fi
      if test "$wxUSE_RICHTEXT" = "yes" ; then
          BUILT_WX_LIBS="richtext $BUILT_WX_LIBS"
      fi
@@ -49793,6 +49853,11 @@ EOF
          COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1=""
      fi
  
          COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1=""
      fi
  
+    COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RIBBON" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1=""
+    fi
+
      COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
      if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
          COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1=""
      COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
      if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
          COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1=""
@@ -49843,6 +49908,11 @@ EOF
          COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1=""
      fi
  
          COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1=""
      fi
  
+    COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RIBBON" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1=""
+    fi
+
      COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
      if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
          COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1=""
      COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
      if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
          COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1=""
@@ -49893,6 +49963,11 @@ EOF
          COND_MONOLITHIC_0_USE_QA_1=""
      fi
  
          COND_MONOLITHIC_0_USE_QA_1=""
      fi
  
+    COND_MONOLITHIC_0_USE_RIBBON_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_RIBBON" = "x1" ; then
+        COND_MONOLITHIC_0_USE_RIBBON_1=""
+    fi
+
      COND_MONOLITHIC_0_USE_RICHTEXT_1="#"
      if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
          COND_MONOLITHIC_0_USE_RICHTEXT_1=""
      COND_MONOLITHIC_0_USE_RICHTEXT_1="#"
      if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
          COND_MONOLITHIC_0_USE_RICHTEXT_1=""
@@ -51977,6 +52052,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1$ac_delim
+COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1!$COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim
@@ -51987,6 +52063,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1$ac_delim
+COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1!$COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim
@@ -51997,6 +52074,7 @@ COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim
  COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim
  COND_MONOLITHIC_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_USE_PROPGRID_1$ac_delim
  COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim
  COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim
  COND_MONOLITHIC_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_USE_PROPGRID_1$ac_delim
  COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim
+COND_MONOLITHIC_0_USE_RIBBON_1!$COND_MONOLITHIC_0_USE_RIBBON_1$ac_delim
  COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim
  COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim
  COND_MONOLITHIC_0_USE_XRC_1!$COND_MONOLITHIC_0_USE_XRC_1$ac_delim
  COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim
  COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim
  COND_MONOLITHIC_0_USE_XRC_1!$COND_MONOLITHIC_0_USE_XRC_1$ac_delim
@@ -52035,9 +52113,6 @@ 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
  _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
@@ -52079,6 +52154,9 @@ _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_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_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_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
@@ -52173,9 +52251,6 @@ WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
  WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
  USE_GUI!$USE_GUI$ac_delim
  AFMINSTALL!$AFMINSTALL$ac_delim
  WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
  USE_GUI!$USE_GUI$ac_delim
  AFMINSTALL!$AFMINSTALL$ac_delim
-WIN32INSTALL!$WIN32INSTALL$ac_delim
-TOOLKIT!$TOOLKIT$ac_delim
-TOOLKIT_DIR!$TOOLKIT_DIR$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
@@ -52217,6 +52292,9 @@ _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
+WIN32INSTALL!$WIN32INSTALL$ac_delim
+TOOLKIT!$TOOLKIT$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
  TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim
  TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim
  cross_compiling!$cross_compiling$ac_delim
@@ -52254,7 +52332,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` = 35; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; 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/samples/internat/makefile.bcc b/samples/internat/makefile.bcc

index 14c84f339e72a197de2893032929142c597cf6ff..eee64fcaaf694c7242d8c050d6e9ef1c9e2514c6 100644 (file)
--- a/samples/internat/makefile.bcc
+++ b/samples/internat/makefile.bcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
diff --git a/samples/internat/makefile.gcc b/samples/internat/makefile.gcc

index 4a28aac0747c06d8647aa303ed5039a3eb78bd28..c21f4f24f55b1a911d93faf7b6c15eaeee814c42 100644 (file)
--- a/samples/internat/makefile.gcc
+++ b/samples/internat/makefile.gcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
diff --git a/samples/ribbon/Makefile.in b/samples/ribbon/Makefile.in

index 19679d07571cd75c890bb453d6ba3077fb9f0c3d..55f0bdc3dda5ee70aae8046a733fd4ca4085f0ba 100644 (file)
--- a/samples/ribbon/Makefile.in
+++ b/samples/ribbon/Makefile.in
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -41,9 +41,9 @@ wx_top_builddir = @wx_top_builddir@
  
  DESTDIR = 
  WX_RELEASE = 2.9
  
  DESTDIR = 
  WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).1
  LIBDIRNAME = $(wx_top_builddir)/lib
  LIBDIRNAME = $(wx_top_builddir)/lib
-RIBBON_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+RIBBON_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
         $(CPPFLAGS) $(CXXFLAGS)
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
         $(CPPFLAGS) $(CXXFLAGS)
@@ -60,8 +60,7 @@ RIBBON_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_DEBUG_FLAG_1@WXDEBUGFLAG = d
+@COND_BUILD_debug@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
  @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
  @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
@@ -73,6 +72,8 @@ RIBBON_OBJECTS =  \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL ribbon$(EXEEXT)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
  @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL ribbon$(EXEEXT)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0
  @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
  @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
  @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
  @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
  @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
  @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
@@ -174,7 +175,7 @@ ribbon$(EXEEXT): $(RIBBON_OBJECTS) $(__ribbon___win32rc)
  @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >ribbon.app/Contents/PkgInfo
  @COND_PLATFORM_MACOSX_1@       
  @COND_PLATFORM_MACOSX_1@       
  @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >ribbon.app/Contents/PkgInfo
  @COND_PLATFORM_MACOSX_1@       
  @COND_PLATFORM_MACOSX_1@       
-@COND_PLATFORM_MACOSX_1@       mv ribbon$(EXEEXT) ribbon.app/Contents/MacOS/ribbon
+@COND_PLATFORM_MACOSX_1@       ln -f ribbon$(EXEEXT) ribbon.app/Contents/MacOS/ribbon
  @COND_PLATFORM_MACOSX_1@       
  @COND_PLATFORM_MACOSX_1@       
  @COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns ribbon.app/Contents/Resources/wxmac.icns
  @COND_PLATFORM_MACOSX_1@       
  @COND_PLATFORM_MACOSX_1@       
  @COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns ribbon.app/Contents/Resources/wxmac.icns
@@ -185,18 +186,9 @@ ribbon_ribbondemo.o: $(srcdir)/ribbondemo.cpp
         $(CXXC) -c -o $@ $(RIBBON_CXXFLAGS) $(srcdir)/ribbondemo.cpp
  
  ribbon_sample_rc.o: $(srcdir)/../sample.rc
         $(CXXC) -c -o $@ $(RIBBON_CXXFLAGS) $(srcdir)/ribbondemo.cpp
  
  ribbon_sample_rc.o: $(srcdir)/../sample.rc
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
  
  
  
  
-@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
-@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
-@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
-@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
-@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
-@COND_USE_STC_1@       cd $(srcdir)/src/stc && ./gen_iface.py
-@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
-@COND_USE_STC_1@    $(srcdir)/include/wx/stc/stc.h
-
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include ./.deps/*.d
  
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include ./.deps/*.d
  
diff --git a/samples/ribbon/makefile.bcc b/samples/ribbon/makefile.bcc

index 9e29668354b2578719fcef0206a1b753855a5a94..aeb6c4594b00b31f355a77dba3619439d57d4c19 100644 (file)
--- a/samples/ribbon/makefile.bcc
+++ b/samples/ribbon/makefile.bcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -45,10 +45,7 @@ PORTNAME = base
  !if "$(USE_GUI)" == "1"
  PORTNAME = msw
  !endif
  !if "$(USE_GUI)" == "1"
  PORTNAME = msw
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
+!if "$(BUILD)" == "debug"
  WXDEBUGFLAG = d
  !endif
  !if "$(UNICODE)" == "1"
  WXDEBUGFLAG = d
  !endif
  !if "$(UNICODE)" == "1"
@@ -108,17 +105,11 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  !if "$(WXUNIV)" == "1"
  __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
  !endif
  !if "$(WXUNIV)" == "1"
  __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
  !endif
  !endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
  __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
  __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
diff --git a/samples/ribbon/makefile.gcc b/samples/ribbon/makefile.gcc

index a52fa7a9cd14e07c3efef786767fdf00d05dc42f..8af1a3d4e70f43031a854a5c7be5ce88c61ac9e0 100644 (file)
--- a/samples/ribbon/makefile.gcc
+++ b/samples/ribbon/makefile.gcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -43,11 +43,6 @@ ifeq ($(USE_GUI),1)
  PORTNAME = msw
  endif
  ifeq ($(BUILD),debug)
  PORTNAME = msw
  endif
  ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
  WXDEBUGFLAG = d
  endif
  ifeq ($(UNICODE),1)
  WXDEBUGFLAG = d
  endif
  ifeq ($(UNICODE),1)
@@ -95,21 +90,11 @@ endif
  ifeq ($(WXUNIV),1)
  __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
  endif
  ifeq ($(WXUNIV),1)
  __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
  endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
  endif
  endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
  endif
  ifeq ($(USE_EXCEPTIONS),0)
  __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
  endif
  ifeq ($(USE_EXCEPTIONS),0)
  __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
diff --git a/samples/ribbon/makefile.unx b/samples/ribbon/makefile.unx

index 8c242c817c4f91a9309510354fe78ce8985c536c..6435938af11fdc58a29c621a5b61749ee8817d22 100644 (file)
--- a/samples/ribbon/makefile.unx
+++ b/samples/ribbon/makefile.unx
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -11,7 +11,7 @@
  # -------------------------------------------------------------------------
  
  # C++ compiler 
  # -------------------------------------------------------------------------
  
  # C++ compiler 
-CXX = g++
+CXX = `$(WX_CONFIG) --cxx`
  
  # Standard flags for C++ 
  CXXFLAGS ?= 
  
  # Standard flags for C++ 
  CXXFLAGS ?= 
@@ -26,19 +26,16 @@ LDFLAGS ?=
  WX_CONFIG ?= wx-config
  
  # Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
  WX_CONFIG ?= wx-config
  
  # Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
  
  # Use DLL build of wx library to use? [0,1]
  
  # Use DLL build of wx library to use? [0,1]
-WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; else echo 0; fi)
  
  # Compile Unicode build of wxWidgets? [0,1]
  
  # Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
-
-# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/')
  
  # Version of the wx library to build against. 
  
  # Version of the wx library to build against. 
-WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/')
  
  
  
  
  
  
@@ -51,9 +48,8 @@ WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.
  CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP
  WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1)
  WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2)
  CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP
  WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1)
  WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2)
-WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \
-       $(WX_CONFIG_SHARED_FLAG) --toolkit=$(WX_PORT) \
-       --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
+WX_CONFIG_FLAGS = $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) \
+       --toolkit=$(WX_PORT) --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
  RIBBON_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
         $(CXXFLAGS)
  RIBBON_OBJECTS =  \
  RIBBON_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
         $(CXXFLAGS)
  RIBBON_OBJECTS =  \
@@ -61,12 +57,6 @@ RIBBON_OBJECTS =  \
  
  ### Conditionally set variables: ###
  
  
  ### Conditionally set variables: ###
  
-ifeq ($(WX_DEBUG),0)
-WX_CONFIG_DEBUG_FLAG = --debug=no
-endif
-ifeq ($(WX_DEBUG),1)
-WX_CONFIG_DEBUG_FLAG = --debug=yes
-endif
  ifeq ($(WX_UNICODE),0)
  WX_CONFIG_UNICODE_FLAG = --unicode=no
  endif
  ifeq ($(WX_UNICODE),0)
  WX_CONFIG_UNICODE_FLAG = --unicode=no
  endif
diff --git a/samples/ribbon/makefile.vc b/samples/ribbon/makefile.vc

index 99a8eaf873e54de3220d9e72dc1e0ba4efb8e487..d3f78534e46fc21405db76a336be7e11fa5b0f72 100644 (file)
--- a/samples/ribbon/makefile.vc
+++ b/samples/ribbon/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -40,10 +40,10 @@ PORTNAME = base
  !if "$(USE_GUI)" == "1"
  PORTNAME = msw
  !endif
  !if "$(USE_GUI)" == "1"
  PORTNAME = msw
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
  WXDEBUGFLAG = d
  !endif
  WXDEBUGFLAG = d
  !endif
-!if "$(DEBUG_FLAG)" == "1"
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
  WXDEBUGFLAG = d
  !endif
  !if "$(UNICODE)" == "1"
  WXDEBUGFLAG = d
  !endif
  !if "$(UNICODE)" == "1"
@@ -199,17 +199,11 @@ __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
  !if "$(WXUNIV)" == "1"
  __WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
  !endif
  !if "$(WXUNIV)" == "1"
  __WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
  !endif
  !endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
  __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
  __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
diff --git a/samples/ribbon/makefile.wat b/samples/ribbon/makefile.wat

index ef72d61dd83ee4fa7f964afeab7313a818ea66f5..6d22d01dde6959265e07b72379043e6eb8a964b7 100644 (file)
--- a/samples/ribbon/makefile.wat
+++ b/samples/ribbon/makefile.wat
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -18,7 +18,11 @@
  !  loaddll wpp      wppdi86
  !  loaddll wppaxp   wppdaxp
  !  loaddll wpp386   wppd386
  !  loaddll wpp      wppdi86
  !  loaddll wppaxp   wppdaxp
  !  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
  !  loaddll wlink    wlink
  !  loaddll wlink    wlink
+! endif
  !  loaddll wlib     wlibd
  !endif
  
  !  loaddll wlib     wlibd
  !endif
  
@@ -36,11 +40,6 @@ PORTNAME = msw
  !endif
  WXDEBUGFLAG =
  !ifeq BUILD debug
  !endif
  WXDEBUGFLAG =
  !ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
  WXDEBUGFLAG = d
  !endif
  WXUNICODEFLAG =
  WXDEBUGFLAG = d
  !endif
  WXUNICODEFLAG =
@@ -184,13 +183,8 @@ __WXUNIV_DEFINE_p =
  __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
  !endif
  __DEBUG_DEFINE_p =
  __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
  !endif
  __DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
  !endif
  __EXCEPTIONS_DEFINE_p =
  !ifeq USE_EXCEPTIONS 0
  !endif
  __EXCEPTIONS_DEFINE_p =
  !ifeq USE_EXCEPTIONS 0
diff --git a/samples/ribbon/ribbon.dsp b/samples/ribbon/ribbon.dsp

index 874c2be65b9f5cf0c0cec62a4d12bc401e79140a..41e4537eb8dbb3971b8e78a1bd0455ea42bd82f3 100644 (file)
--- a/samples/ribbon/ribbon.dsp
+++ b/samples/ribbon/ribbon.dsp
@@ -72,12 +72,12 @@ LINK32=link.exe
  # PROP Output_Dir "vc_mswunivuddll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\ribbon"\r
  # PROP Target_Dir ""\r
  # PROP Output_Dir "vc_mswunivuddll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\ribbon"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
@@ -122,12 +122,12 @@ LINK32=link.exe
  # PROP Output_Dir "vc_mswuddll"\r
  # PROP Intermediate_Dir "vc_mswuddll\ribbon"\r
  # PROP Target_Dir ""\r
  # PROP Output_Dir "vc_mswuddll"\r
  # PROP Intermediate_Dir "vc_mswuddll\ribbon"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
@@ -172,12 +172,12 @@ LINK32=link.exe
  # PROP Output_Dir "vc_mswunivud"\r
  # PROP Intermediate_Dir "vc_mswunivud\ribbon"\r
  # PROP Target_Dir ""\r
  # PROP Output_Dir "vc_mswunivud"\r
  # PROP Intermediate_Dir "vc_mswunivud\ribbon"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
@@ -222,12 +222,12 @@ LINK32=link.exe
  # PROP Output_Dir "vc_mswud"\r
  # PROP Intermediate_Dir "vc_mswud\ribbon"\r
  # PROP Target_Dir ""\r
  # PROP Output_Dir "vc_mswud"\r
  # PROP Intermediate_Dir "vc_mswud\ribbon"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
  BSC32=bscmake.exe\r
  # ADD BASE BSC32 /nologo\r
  # ADD BSC32 /nologo\r
diff --git a/samples/ribbon/ribbon_vc7.sln b/samples/ribbon/ribbon_vc7.sln

index 90c636c36f71f2b3ddb70c80c5ffcaf9fe1d45df..5fdca525ecb0f4264228e48e63b5462e229717f2 100644 (file)
--- a/samples/ribbon/ribbon_vc7.sln
+++ b/samples/ribbon/ribbon_vc7.sln
@@ -3,32 +3,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "ribbon_vc7.vcproj
  EndProject\r
  Global\r
         GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
  EndProject\r
  Global\r
         GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               DLL Universal Release|Win32 = DLL Universal Release|Win32\r
-               DLL Universal Debug|Win32 = DLL Universal Debug|Win32\r
-               DLL Release|Win32 = DLL Release|Win32\r
-               DLL Debug|Win32 = DLL Debug|Win32\r
-               Universal Release|Win32 = Universal Release|Win32\r
-               Universal Debug|Win32 = Universal Debug|Win32\r
-               Release|Win32 = Release|Win32\r
                 Debug|Win32 = Debug|Win32\r
                 Debug|Win32 = Debug|Win32\r
+               Release|Win32 = Release|Win32\r
+               Universal Debug|Win32 = Universal Debug|Win32\r
+               Universal Release|Win32 = Universal Release|Win32\r
+               DLL Debug|Win32 = DLL Debug|Win32\r
+               DLL Release|Win32 = DLL Release|Win32\r
+               DLL Universal Debug|Win32 = DLL Universal Debug|Win32\r
+               DLL Universal Release|Win32 = DLL Universal Release|Win32\r
         EndGlobalSection\r
         GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
         EndGlobalSection\r
         GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
-               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
-               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
-               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
-               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
-               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
-               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
-               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
-               {717E754A-A748-5A81-AA86-AA4640D51560}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
-               {717E754A-A748-5A81-AA86-AA4640D51560}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
-               {717E754A-A748-5A81-AA86-AA4640D51560}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
-               {717E754A-A748-5A81-AA86-AA4640D51560}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
-               {717E754A-A748-5A81-AA86-AA4640D51560}.Release|Win32.ActiveCfg = Release|Win32\r
-               {717E754A-A748-5A81-AA86-AA4640D51560}.Release|Win32.Build.0 = Release|Win32\r
                 {717E754A-A748-5A81-AA86-AA4640D51560}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {717E754A-A748-5A81-AA86-AA4640D51560}.Debug|Win32.Build.0 = Debug|Win32\r
                 {717E754A-A748-5A81-AA86-AA4640D51560}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {717E754A-A748-5A81-AA86-AA4640D51560}.Debug|Win32.Build.0 = Debug|Win32\r
+               {717E754A-A748-5A81-AA86-AA4640D51560}.Release|Win32.ActiveCfg = Release|Win32\r
+               {717E754A-A748-5A81-AA86-AA4640D51560}.Release|Win32.Build.0 = Release|Win32\r
+               {717E754A-A748-5A81-AA86-AA4640D51560}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
+               {717E754A-A748-5A81-AA86-AA4640D51560}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
+               {717E754A-A748-5A81-AA86-AA4640D51560}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
+               {717E754A-A748-5A81-AA86-AA4640D51560}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
+               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
+               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
+               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
+               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
+               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
+               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
+               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
+               {717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
         EndGlobalSection\r
         GlobalSection(SolutionProperties) = preSolution\r
                 HideSolutionNode = FALSE\r
         EndGlobalSection\r
         GlobalSection(SolutionProperties) = preSolution\r
                 HideSolutionNode = FALSE\r
diff --git a/samples/ribbon/ribbon_vc7.vcproj b/samples/ribbon/ribbon_vc7.vcproj

index 8577f8dbffc8e6ffa6c0cbc8165676863ba57574..dbf44c212011afc66fe78cfebee0f29043ef22f0 100644 (file)
--- a/samples/ribbon/ribbon_vc7.vcproj
+++ b/samples/ribbon/ribbon_vc7.vcproj
@@ -1,8 +1,8 @@
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
-  This makefile was generated by\r
-  Bakefile 0.2.5 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.6 (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
@@ -17,24 +17,26 @@
         </Platforms>\r
         <Configurations>\r
                 <Configuration\r
         </Platforms>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\ribbon"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivudll\ribbon\"\r
-                               ObjectFile="vc_mswunivudll\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\ribbon.pdb"\r
+                               ObjectFile="vc_mswud\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswud\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -44,17 +46,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswunivudll\ribbon.exe"\r
+                               AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswud\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateDebugInformation="TRUE"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivudll\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -63,9 +67,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -78,27 +82,23 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\ribbon"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivuddll\ribbon\"\r
-                               ObjectFile="vc_mswunivuddll\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\ribbon.pdb"\r
+                               ObjectFile="vc_mswu\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswu\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -108,17 +108,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswunivuddll\ribbon.exe"\r
+                               AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswu\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateDebugInformation="TRUE"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -127,9 +129,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -142,24 +144,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\ribbon"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswudll\ribbon\"\r
-                               ObjectFile="vc_mswudll\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswudll\ribbon.pdb"\r
+                               ObjectFile="vc_mswunivud\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -169,17 +173,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswudll\ribbon.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswunivud\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateDebugInformation="TRUE"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswudll\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -188,9 +194,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -203,27 +209,23 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\ribbon"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswuddll\ribbon\"\r
-                               ObjectFile="vc_mswuddll\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\ribbon.pdb"\r
+                               ObjectFile="vc_mswunivu\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -233,17 +235,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswuddll\ribbon.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswunivu\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateDebugInformation="TRUE"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswuddll\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -252,9 +256,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -267,24 +271,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\ribbon"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivu\ribbon\"\r
-                               ObjectFile="vc_mswunivu\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\ribbon.pdb"\r
+                               ObjectFile="vc_mswuddll\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -294,17 +300,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswunivu\ribbon.exe"\r
+                               AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswuddll\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivu\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -313,9 +321,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -328,27 +336,23 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\ribbon"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivud\ribbon\"\r
-                               ObjectFile="vc_mswunivud\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\ribbon.pdb"\r
+                               ObjectFile="vc_mswudll\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswudll\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -358,17 +362,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswunivud\ribbon.exe"\r
+                               AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswudll\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivud\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -377,9 +383,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -392,24 +398,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\ribbon"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswu\ribbon\"\r
-                               ObjectFile="vc_mswu\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswu\ribbon.pdb"\r
+                               ObjectFile="vc_mswunivuddll\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -419,17 +427,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswu\ribbon.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswunivuddll\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswu\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -438,9 +448,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -453,27 +463,23 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\ribbon"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="TRUE"\r
                                 ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswud\ribbon\"\r
-                               ObjectFile="vc_mswud\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswud\ribbon.pdb"\r
+                               ObjectFile="vc_mswunivudll\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="TRUE"\r
                                 Detect64BitPortabilityProblems="TRUE"\r
@@ -483,17 +489,19 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswud\ribbon.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswunivudll\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateDebugInformation="TRUE"\r
                                 GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswud\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
                                 SubSystem="2"\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -502,9 +510,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -534,7 +542,7 @@
                         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
                         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
-                               RelativePath=".\..\sample.rc">\r
+                               RelativePath="..\sample.rc">\r
                         </File>\r
                 </Filter>\r
         </Files>\r
                         </File>\r
                 </Filter>\r
         </Files>\r
diff --git a/samples/ribbon/ribbon_vc8.sln b/samples/ribbon/ribbon_vc8.sln

index dfcd508c2c4313daa49735cf9cac0bcf373aa3ce..21fd97f75fd84c86657afd845aab0390f4f8b253 100644 (file)
--- a/samples/ribbon/ribbon_vc8.sln
+++ b/samples/ribbon/ribbon_vc8.sln
@@ -4,32 +4,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "ribbon_vc8.vcproj
  EndProject\r
  Global\r
         GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
  EndProject\r
  Global\r
         GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               DLL Universal Release|Win32 = DLL Universal Release|Win32\r
-               DLL Universal Debug|Win32 = DLL Universal Debug|Win32\r
-               DLL Release|Win32 = DLL Release|Win32\r
-               DLL Debug|Win32 = DLL Debug|Win32\r
-               Universal Release|Win32 = Universal Release|Win32\r
-               Universal Debug|Win32 = Universal Debug|Win32\r
-               Release|Win32 = Release|Win32\r
                 Debug|Win32 = Debug|Win32\r
                 Debug|Win32 = Debug|Win32\r
+               Release|Win32 = Release|Win32\r
+               Universal Debug|Win32 = Universal Debug|Win32\r
+               Universal Release|Win32 = Universal Release|Win32\r
+               DLL Debug|Win32 = DLL Debug|Win32\r
+               DLL Release|Win32 = DLL Release|Win32\r
+               DLL Universal Debug|Win32 = DLL Universal Debug|Win32\r
+               DLL Universal Release|Win32 = DLL Universal Release|Win32\r
         EndGlobalSection\r
         GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
         EndGlobalSection\r
         GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
-               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
-               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
-               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
-               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
-               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
-               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
-               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
-               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
-               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
-               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
-               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
-               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Release|Win32.ActiveCfg = Release|Win32\r
-               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Release|Win32.Build.0 = Release|Win32\r
                 {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Debug|Win32.Build.0 = Debug|Win32\r
                 {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Debug|Win32.Build.0 = Debug|Win32\r
+               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Release|Win32.ActiveCfg = Release|Win32\r
+               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Release|Win32.Build.0 = Release|Win32\r
+               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
+               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
+               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
+               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
+               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
+               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
+               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
+               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
+               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
+               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
+               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
+               {BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
         EndGlobalSection\r
         GlobalSection(SolutionProperties) = preSolution\r
                 HideSolutionNode = FALSE\r
         EndGlobalSection\r
         GlobalSection(SolutionProperties) = preSolution\r
                 HideSolutionNode = FALSE\r
diff --git a/samples/ribbon/ribbon_vc8.vcproj b/samples/ribbon/ribbon_vc8.vcproj

index 559d4dab13850ed23892ee2663afc1878c8ab5db..529cd7cc7fd15c36fe86ea6ffe372564cabfd0f0 100644 (file)
--- a/samples/ribbon/ribbon_vc8.vcproj
+++ b/samples/ribbon/ribbon_vc8.vcproj
@@ -1,8 +1,8 @@
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
-  This makefile was generated by\r
-  Bakefile 0.2.5 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.6 (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,9 +22,9 @@
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\ribbon"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -44,18 +44,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivudll\ribbon\"\r
-                               ObjectFile="vc_mswunivudll\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\ribbon.pdb"\r
+                               ObjectFile="vc_mswud\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswud\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -66,9 +70,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -76,14 +80,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswunivudll\ribbon.exe"\r
+                               AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswud\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivudll\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -98,7 +102,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\ribbon_vc8.bsc"\r
+                               OutputFile="vc_mswud\ribbon_vc8.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -115,9 +119,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\ribbon"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -137,21 +141,19 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivuddll\ribbon\"\r
-                               ObjectFile="vc_mswunivuddll\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\ribbon.pdb"\r
+                               ObjectFile="vc_mswu\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswu\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -162,9 +164,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -172,14 +174,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswunivuddll\ribbon.exe"\r
+                               AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswu\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -194,7 +196,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\ribbon_vc8.bsc"\r
+                               OutputFile="vc_mswu\ribbon_vc8.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -211,9 +213,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\ribbon"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -233,18 +235,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswudll\ribbon\"\r
-                               ObjectFile="vc_mswudll\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswudll\ribbon.pdb"\r
+                               ObjectFile="vc_mswunivud\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -255,9 +261,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -265,14 +271,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswudll\ribbon.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswunivud\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswudll\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -287,7 +293,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\ribbon_vc8.bsc"\r
+                               OutputFile="vc_mswunivud\ribbon_vc8.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -304,9 +310,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\ribbon"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -326,21 +332,19 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswuddll\ribbon\"\r
-                               ObjectFile="vc_mswuddll\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\ribbon.pdb"\r
+                               ObjectFile="vc_mswunivu\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -351,9 +355,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -361,14 +365,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswuddll\ribbon.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswunivu\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswuddll\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -383,7 +387,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\ribbon_vc8.bsc"\r
+                               OutputFile="vc_mswunivu\ribbon_vc8.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -400,9 +404,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\ribbon"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -422,18 +426,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivu\ribbon\"\r
-                               ObjectFile="vc_mswunivu\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\ribbon.pdb"\r
+                               ObjectFile="vc_mswuddll\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -444,9 +452,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -454,14 +462,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswunivu\ribbon.exe"\r
+                               AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswuddll\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivu\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -476,7 +484,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\ribbon_vc8.bsc"\r
+                               OutputFile="vc_mswuddll\ribbon_vc8.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -493,9 +501,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\ribbon"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -515,21 +523,19 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivud\ribbon\"\r
-                               ObjectFile="vc_mswunivud\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\ribbon.pdb"\r
+                               ObjectFile="vc_mswudll\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswudll\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -540,9 +546,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -550,14 +556,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswunivud\ribbon.exe"\r
+                               AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswudll\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivud\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -572,7 +578,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\ribbon_vc8.bsc"\r
+                               OutputFile="vc_mswudll\ribbon_vc8.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -589,9 +595,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\ribbon"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -611,18 +617,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswu\ribbon\"\r
-                               ObjectFile="vc_mswu\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswu\ribbon.pdb"\r
+                               ObjectFile="vc_mswunivuddll\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -633,9 +643,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -643,14 +653,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswu\ribbon.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswunivuddll\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswu\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -665,7 +675,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\ribbon_vc8.bsc"\r
+                               OutputFile="vc_mswunivuddll\ribbon_vc8.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -682,9 +692,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\ribbon"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -704,21 +714,19 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswud\ribbon\"\r
-                               ObjectFile="vc_mswud\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswud\ribbon.pdb"\r
+                               ObjectFile="vc_mswunivudll\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -729,9 +737,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -739,14 +747,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswud\ribbon.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswunivudll\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswud\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -761,7 +769,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\ribbon_vc8.bsc"\r
+                               OutputFile="vc_mswunivudll\ribbon_vc8.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -798,7 +806,7 @@
                         UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         >\r
                         <File\r
                         UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         >\r
                         <File\r
-                               RelativePath=".\..\sample.rc"\r
+                               RelativePath="..\sample.rc"\r
                                 >\r
                         </File>\r
                 </Filter>\r
                                 >\r
                         </File>\r
                 </Filter>\r
diff --git a/samples/ribbon/ribbon_vc9.sln b/samples/ribbon/ribbon_vc9.sln

index 06942a653121e4f71fde48f6197e66ae3c4c3592..368dfda92689a6d3a418b172cb962b55168c4765 100644 (file)
--- a/samples/ribbon/ribbon_vc9.sln
+++ b/samples/ribbon/ribbon_vc9.sln
@@ -4,32 +4,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "ribbon_vc9.vcproj
  EndProject\r
  Global\r
         GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
  EndProject\r
  Global\r
         GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               DLL Universal Release|Win32 = DLL Universal Release|Win32\r
-               DLL Universal Debug|Win32 = DLL Universal Debug|Win32\r
-               DLL Release|Win32 = DLL Release|Win32\r
-               DLL Debug|Win32 = DLL Debug|Win32\r
-               Universal Release|Win32 = Universal Release|Win32\r
-               Universal Debug|Win32 = Universal Debug|Win32\r
-               Release|Win32 = Release|Win32\r
                 Debug|Win32 = Debug|Win32\r
                 Debug|Win32 = Debug|Win32\r
+               Release|Win32 = Release|Win32\r
+               Universal Debug|Win32 = Universal Debug|Win32\r
+               Universal Release|Win32 = Universal Release|Win32\r
+               DLL Debug|Win32 = DLL Debug|Win32\r
+               DLL Release|Win32 = DLL Release|Win32\r
+               DLL Universal Debug|Win32 = DLL Universal Debug|Win32\r
+               DLL Universal Release|Win32 = DLL Universal Release|Win32\r
         EndGlobalSection\r
         GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
         EndGlobalSection\r
         GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
-               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
-               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
-               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
-               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
-               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
-               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
-               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
-               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
-               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
-               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
-               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
-               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Release|Win32.ActiveCfg = Release|Win32\r
-               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Release|Win32.Build.0 = Release|Win32\r
                 {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Debug|Win32.Build.0 = Debug|Win32\r
                 {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Debug|Win32.ActiveCfg = Debug|Win32\r
                 {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Debug|Win32.Build.0 = Debug|Win32\r
+               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Release|Win32.ActiveCfg = Release|Win32\r
+               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Release|Win32.Build.0 = Release|Win32\r
+               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32\r
+               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Debug|Win32.Build.0 = Universal Debug|Win32\r
+               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Release|Win32.ActiveCfg = Universal Release|Win32\r
+               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Release|Win32.Build.0 = Universal Release|Win32\r
+               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32\r
+               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Debug|Win32.Build.0 = DLL Debug|Win32\r
+               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Release|Win32.ActiveCfg = DLL Release|Win32\r
+               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Release|Win32.Build.0 = DLL Release|Win32\r
+               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32\r
+               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32\r
+               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32\r
+               {B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32\r
         EndGlobalSection\r
         GlobalSection(SolutionProperties) = preSolution\r
                 HideSolutionNode = FALSE\r
         EndGlobalSection\r
         GlobalSection(SolutionProperties) = preSolution\r
                 HideSolutionNode = FALSE\r
diff --git a/samples/ribbon/ribbon_vc9.vcproj b/samples/ribbon/ribbon_vc9.vcproj

index ceb346cfefff5268ec564b572d06b59c43576222..3dcba9e7e30b1d118013c08bbf9b8881d3dd0df9 100644 (file)
--- a/samples/ribbon/ribbon_vc9.vcproj
+++ b/samples/ribbon/ribbon_vc9.vcproj
@@ -1,8 +1,8 @@
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
-  This makefile was generated by\r
-  Bakefile 0.2.5 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.6 (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,9 +22,9 @@
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\ribbon"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -44,19 +44,22 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivudll\ribbon\"\r
-                               ObjectFile="vc_mswunivudll\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\ribbon.pdb"\r
+                               ObjectFile="vc_mswud\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswud\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -66,9 +69,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -76,14 +79,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswunivudll\ribbon.exe"\r
+                               AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswud\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivudll\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -98,7 +101,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\ribbon_vc9.bsc"\r
+                               OutputFile="vc_mswud\ribbon_vc9.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -112,9 +115,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\ribbon"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -134,21 +137,20 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivuddll\ribbon\"\r
-                               ObjectFile="vc_mswunivuddll\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\ribbon.pdb"\r
+                               ObjectFile="vc_mswu\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswu\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -158,9 +160,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -168,14 +170,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswunivuddll\ribbon.exe"\r
+                               AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswu\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -190,7 +192,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\ribbon_vc9.bsc"\r
+                               OutputFile="vc_mswu\ribbon_vc9.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -204,9 +206,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\ribbon"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -226,19 +228,22 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswudll\ribbon\"\r
-                               ObjectFile="vc_mswudll\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswudll\ribbon.pdb"\r
+                               ObjectFile="vc_mswunivud\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -248,9 +253,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -258,14 +263,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswudll\ribbon.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswunivud\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswudll\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -280,7 +285,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\ribbon_vc9.bsc"\r
+                               OutputFile="vc_mswunivud\ribbon_vc9.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -294,9 +299,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\ribbon"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -316,21 +321,20 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswuddll\ribbon\"\r
-                               ObjectFile="vc_mswuddll\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\ribbon.pdb"\r
+                               ObjectFile="vc_mswunivu\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -340,9 +344,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -350,14 +354,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswuddll\ribbon.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswunivu\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswuddll\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -372,7 +376,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\ribbon_vc9.bsc"\r
+                               OutputFile="vc_mswunivu\ribbon_vc9.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -386,9 +390,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\ribbon"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -408,19 +412,22 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivu\ribbon\"\r
-                               ObjectFile="vc_mswunivu\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\ribbon.pdb"\r
+                               ObjectFile="vc_mswuddll\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -430,9 +437,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -440,14 +447,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswunivu\ribbon.exe"\r
+                               AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswuddll\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivu\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -462,7 +469,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\ribbon_vc9.bsc"\r
+                               OutputFile="vc_mswuddll\ribbon_vc9.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -476,9 +483,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\ribbon"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -498,21 +505,20 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivud\ribbon\"\r
-                               ObjectFile="vc_mswunivud\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\ribbon.pdb"\r
+                               ObjectFile="vc_mswudll\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswudll\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -522,9 +528,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -532,14 +538,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswunivud\ribbon.exe"\r
+                               AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswudll\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivud\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -554,7 +560,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\ribbon_vc9.bsc"\r
+                               OutputFile="vc_mswudll\ribbon_vc9.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -568,9 +574,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\ribbon"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -590,19 +596,22 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswu\ribbon\"\r
-                               ObjectFile="vc_mswu\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswu\ribbon.pdb"\r
+                               ObjectFile="vc_mswunivuddll\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -612,9 +621,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -622,14 +631,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswu\ribbon.exe"\r
+                               AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswunivuddll\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswu\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -644,7 +653,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\ribbon_vc9.bsc"\r
+                               OutputFile="vc_mswunivuddll\ribbon_vc9.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -658,9 +667,9 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\ribbon"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\ribbon"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         ConfigurationType="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -680,21 +689,20 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswud\ribbon\"\r
-                               ObjectFile="vc_mswud\ribbon\"\r
-                               ProgramDataBaseFileName="vc_mswud\ribbon.pdb"\r
+                               ObjectFile="vc_mswunivudll\ribbon\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\ribbon.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -704,9 +712,9 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
@@ -714,14 +722,14 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.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 wininet.lib"\r
-                               OutputFile="vc_mswud\ribbon.exe"\r
+                               AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.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 wininet.lib"\r
+                               OutputFile="vc_mswunivudll\ribbon.exe"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
                                 LinkIncremental="2"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswud\ribbon.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\ribbon.pdb"\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
                                 SubSystem="2"\r
                                 TargetMachine="1"\r
                         />\r
@@ -736,7 +744,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\ribbon_vc9.bsc"\r
+                               OutputFile="vc_mswunivudll\ribbon_vc9.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -770,7 +778,7 @@
                         UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         >\r
                         <File\r
                         UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                         >\r
                         <File\r
-                               RelativePath=".\..\sample.rc"\r
+                               RelativePath="..\sample.rc"\r
                                 >\r
                         </File>\r
                 </Filter>\r
                                 >\r
                         </File>\r
                 </Filter>\r
diff --git a/utils/Makefile.in b/utils/Makefile.in

index 019ffc904bf5779170d155648dc1600ce65b9be1..dbc96d8fce86337c6bcd30c1c3f7136ee41d9ed1 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
diff --git a/utils/execmon/execmon_vc9.vcproj b/utils/execmon/execmon_vc9.vcproj

index 6aba4024873afcc1d75989a9c43b313b40fb08db..61b436d284b8541bdbaf0f5de5d7ef8fdc3a0840 100644 (file)
--- a/utils/execmon/execmon_vc9.vcproj
+++ b/utils/execmon/execmon_vc9.vcproj
@@ -43,7 +43,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCMIDLTool"\r
+                               Name="VCIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                         />\r
                                 PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                         />\r
@@ -136,7 +136,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCMIDLTool"\r
+                               Name="VCIDLTool"\r
                                 PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                         />\r
                                 PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                         />\r
@@ -227,7 +227,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCMIDLTool"\r
+                               Name="VCIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                         />\r
                                 PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                         />\r
@@ -320,7 +320,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCMIDLTool"\r
+                               Name="VCIDLTool"\r
                                 PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                         />\r
                                 PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                         />\r
@@ -411,7 +411,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCMIDLTool"\r
+                               Name="VCIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                         />\r
                                 PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                         />\r
@@ -504,7 +504,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCMIDLTool"\r
+                               Name="VCIDLTool"\r
                                 PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                         />\r
                                 PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                         />\r
@@ -595,7 +595,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCMIDLTool"\r
+                               Name="VCIDLTool"\r
                                 PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                         />\r
                                 PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                         />\r
@@ -688,7 +688,7 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCMIDLTool"\r
+                               Name="VCIDLTool"\r
                                 PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                         />\r
                                 PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                 AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                         />\r
diff --git a/utils/execmon/makefile.bcc b/utils/execmon/makefile.bcc

index 809e0b666156274a1505b40f0c102304659f9a09..35e922bd580df003371eeca80334e8e4e3e0ba91 100644 (file)
--- a/utils/execmon/makefile.bcc
+++ b/utils/execmon/makefile.bcc
@@ -1,191 +1,191 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXECMON_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)\r
-EXECMON_OBJECTS =  \\r
-       $(OBJS)\execmon_execmon.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_XRC)" == "1"\r
-__execmon___depname = $(OBJS)\execmon.exe\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__execmon___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe\r
-       -if exist $(OBJS)\execmon.tds del $(OBJS)\execmon.tds\r
-       -if exist $(OBJS)\execmon.ilc del $(OBJS)\execmon.ilc\r
-       -if exist $(OBJS)\execmon.ild del $(OBJS)\execmon.ild\r
-       -if exist $(OBJS)\execmon.ilf del $(OBJS)\execmon.ilf\r
-       -if exist $(OBJS)\execmon.ils del $(OBJS)\execmon.ils\r
-\r
-!if "$(USE_XRC)" == "1"\r
-$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|\r
-       c0x32.obj $(EXECMON_OBJECTS),$@,, $(__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,,\r
-|\r
-!endif\r
-\r
-$(OBJS)\execmon_execmon.obj: .\execmon.cpp\r
-       $(CXX) -q -c -P -o$@ $(EXECMON_CXXFLAGS) .\execmon.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXECMON_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+EXECMON_OBJECTS =  \
+       $(OBJS)\execmon_execmon.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_XRC)" == "1"
+__execmon___depname = $(OBJS)\execmon.exe
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__execmon___depname)
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
+       -if exist $(OBJS)\execmon.tds del $(OBJS)\execmon.tds
+       -if exist $(OBJS)\execmon.ilc del $(OBJS)\execmon.ilc
+       -if exist $(OBJS)\execmon.ild del $(OBJS)\execmon.ild
+       -if exist $(OBJS)\execmon.ilf del $(OBJS)\execmon.ilf
+       -if exist $(OBJS)\execmon.ils del $(OBJS)\execmon.ils
+
+!if "$(USE_XRC)" == "1"
+$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|
+       c0x32.obj $(EXECMON_OBJECTS),$@,, $(__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
+
+$(OBJS)\execmon_execmon.obj: .\execmon.cpp
+       $(CXX) -q -c -P -o$@ $(EXECMON_CXXFLAGS) .\execmon.cpp
+
diff --git a/utils/execmon/makefile.gcc b/utils/execmon/makefile.gcc

index 50503a68b1d52fee16bcb33760aae5ea118d0c03..5d934a354dd12b36f9d5b1d815f5ba59be2560e6 100644 (file)
--- a/utils/execmon/makefile.gcc
+++ b/utils/execmon/makefile.gcc
@@ -1,184 +1,184 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXECMON_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-EXECMON_OBJECTS =  \\r
-       $(OBJS)\execmon_execmon.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(USE_XRC),1)\r
-__execmon___depname = $(OBJS)\execmon.exe\r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__execmon___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe\r
-\r
-ifeq ($(USE_XRC),1)\r
-$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)\r
-       $(CXX) -o $@ $(EXECMON_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__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 -lwininet\r
-endif\r
-\r
-$(OBJS)\execmon_execmon.o: ./execmon.cpp\r
-       $(CXX) -c -o $@ $(EXECMON_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXECMON_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+EXECMON_OBJECTS =  \
+       $(OBJS)\execmon_execmon.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(USE_XRC),1)
+__execmon___depname = $(OBJS)\execmon.exe
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__execmon___depname)
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
+
+ifeq ($(USE_XRC),1)
+$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
+       $(CXX) -o $@ $(EXECMON_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__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 -lwininet
+endif
+
+$(OBJS)\execmon_execmon.o: ./execmon.cpp
+       $(CXX) -c -o $@ $(EXECMON_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
diff --git a/utils/execmon/makefile.vc b/utils/execmon/makefile.vc

index b745d77b8ccc665a8cdb67f78a0d946cb4a39ba2..d569762e4a2242e6d5a86b8e0780174c111b6638 100644 (file)
--- a/utils/execmon/makefile.vc
+++ b/utils/execmon/makefile.vc
@@ -1,251 +1,251 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXECMON_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-EXECMON_OBJECTS =  \\r
-       $(OBJS)\execmon_execmon.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_XRC)" == "1"\r
-__execmon___depname = $(OBJS)\execmon.exe\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__execmon___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe\r
-       -if exist $(OBJS)\execmon.ilk del $(OBJS)\execmon.ilk\r
-       -if exist $(OBJS)\execmon.pdb del $(OBJS)\execmon.pdb\r
-\r
-!if "$(USE_XRC)" == "1"\r
-$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<\r
-       $(EXECMON_OBJECTS)   $(__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 wininet.lib\r
-<<\r
-!endif\r
-\r
-$(OBJS)\execmon_execmon.obj: .\execmon.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(EXECMON_CXXFLAGS) .\execmon.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXECMON_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(____DEBUGRUNTIME_2_p) \
+       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \
+       /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
+       $(CXXFLAGS)
+EXECMON_OBJECTS =  \
+       $(OBJS)\execmon_execmon.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!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 "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!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 "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_XRC)" == "1"
+__execmon___depname = $(OBJS)\execmon.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_2_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_2_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_3 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_3 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_3 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_3 = d
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_4 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_4 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_7 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_7 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_9 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_9 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_10 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_10 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__execmon___depname)
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
+       -if exist $(OBJS)\execmon.ilk del $(OBJS)\execmon.ilk
+       -if exist $(OBJS)\execmon.pdb del $(OBJS)\execmon.pdb
+
+!if "$(USE_XRC)" == "1"
+$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
+       $(EXECMON_OBJECTS)  $(__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 wininet.lib
+<<
+!endif
+
+$(OBJS)\execmon_execmon.obj: .\execmon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(EXECMON_CXXFLAGS) .\execmon.cpp
+
diff --git a/utils/execmon/makefile.wat b/utils/execmon/makefile.wat

index 90852b7f7c4eec7946054cdb02c2e5c94b8e6fcd..bc84fe2a5e747a466dac46f1335350d4117ce1f9 100644 (file)
--- a/utils/execmon/makefile.wat
+++ b/utils/execmon/makefile.wat
@@ -1,245 +1,245 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__execmon___depname =\r
-!ifeq USE_XRC 1\r
-__execmon___depname = $(OBJS)\execmon.exe\r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXECMON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-EXECMON_OBJECTS =  &\r
-       $(OBJS)\execmon_execmon.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(__execmon___depname)\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe\r
-\r
-!ifeq USE_XRC 1\r
-$(OBJS)\execmon.exe :  $(EXECMON_OBJECTS)\r
-       @%create $(OBJS)\execmon.lbc\r
-       @%append $(OBJS)\execmon.lbc option quiet\r
-       @%append $(OBJS)\execmon.lbc name $^@\r
-       @%append $(OBJS)\execmon.lbc option caseexact\r
-       @%append $(OBJS)\execmon.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)\r
-       @for %i in ($(EXECMON_OBJECTS)) do @%append $(OBJS)\execmon.lbc file %i\r
-       @for %i in ( $(__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 wininet.lib) do @%append $(OBJS)\execmon.lbc library %i\r
-       @%append $(OBJS)\execmon.lbc\r
-       @for %i in () do @%append $(OBJS)\execmon.lbc option stack=%i\r
-       wlink @$(OBJS)\execmon.lbc\r
-!endif\r
-\r
-$(OBJS)\execmon_execmon.obj :  .AUTODEPEND .\execmon.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(EXECMON_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__execmon___depname =
+!ifeq USE_XRC 1
+__execmon___depname = $(OBJS)\execmon.exe
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXECMON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+EXECMON_OBJECTS =  &
+       $(OBJS)\execmon_execmon.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(__execmon___depname)
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
+
+!ifeq USE_XRC 1
+$(OBJS)\execmon.exe :  $(EXECMON_OBJECTS)
+       @%create $(OBJS)\execmon.lbc
+       @%append $(OBJS)\execmon.lbc option quiet
+       @%append $(OBJS)\execmon.lbc name $^@
+       @%append $(OBJS)\execmon.lbc option caseexact
+       @%append $(OBJS)\execmon.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)
+       @for %i in ($(EXECMON_OBJECTS)) do @%append $(OBJS)\execmon.lbc file %i
+       @for %i in ( $(__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 wininet.lib) do @%append $(OBJS)\execmon.lbc library %i
+       @%append $(OBJS)\execmon.lbc
+       @for %i in () do @%append $(OBJS)\execmon.lbc option stack=%i
+       wlink @$(OBJS)\execmon.lbc
+!endif
+
+$(OBJS)\execmon_execmon.obj :  .AUTODEPEND .\execmon.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(EXECMON_CXXFLAGS) $<
+
diff --git a/utils/makefile.bcc b/utils/makefile.bcc

index 837c9b866850341b6780e34cc643f96a7989e572..e3df30676ecabea4a40d0ea89320923f023e15c0 100644 (file)
--- a/utils/makefile.bcc
+++ b/utils/makefile.bcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
diff --git a/utils/makefile.gcc b/utils/makefile.gcc

index f50740d24b93e7249b4ad41c2cc4cde0218f96dc..0bc0e666bb1899959753e66aa0f5246d5b90770e 100644 (file)
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
diff --git a/utils/makefile.vc b/utils/makefile.vc

index 7124d4faaa79ac57b4cb5ead0b30a3aac7e32a83..3fe42dcd4aed18d09a52416d36c1d441265a8ba9 100644 (file)
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
diff --git a/utils/makefile.wat b/utils/makefile.wat

index be1a97cac60c954a8e23276662b17d47bad472f4..a4f631f9d590eb483092ac5c5aff35b4e844be53 100644 (file)
--- a/utils/makefile.wat
+++ b/utils/makefile.wat
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -18,7 +18,11 @@
  !  loaddll wpp      wppdi86
  !  loaddll wppaxp   wppdaxp
  !  loaddll wpp386   wppd386
  !  loaddll wpp      wppdi86
  !  loaddll wppaxp   wppdaxp
  !  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
  !  loaddll wlink    wlink
  !  loaddll wlink    wlink
+! endif
  !  loaddll wlib     wlibd
  !endif
  
  !  loaddll wlib     wlibd
  !endif
author	Vadim Zeitlin <vadim@wxwidgets.org>
	Wed, 16 Sep 2009 13:07:10 +0000 (13:07 +0000)
committer	Vadim Zeitlin <vadim@wxwidgets.org>
	Wed, 16 Sep 2009 13:07:10 +0000 (13:07 +0000)
Makefile.in		patch \| blob \| blame \| history
autoconf_inc.m4		patch \| blob \| blame \| history
build/msw/makefile.bcc		patch \| blob \| blame \| history
build/msw/makefile.gcc		patch \| blob \| blame \| history
build/msw/makefile.vc		patch \| blob \| blame \| history
build/msw/wx_ribbon.dsp		patch \| blob \| blame \| history
build/msw/wx_vc7.sln		patch \| blob \| blame \| history
build/msw/wx_vc7_ribbon.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8.sln		patch \| blob \| blame \| history
build/msw/wx_vc8_ribbon.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9.sln		patch \| blob \| blame \| history
build/msw/wx_vc9_ribbon.vcproj		patch \| blob \| blame \| history
configure		patch \| blob \| blame \| history
samples/internat/makefile.bcc		patch \| blob \| blame \| history
samples/internat/makefile.gcc		patch \| blob \| blame \| history
samples/ribbon/Makefile.in		patch \| blob \| blame \| history
samples/ribbon/makefile.bcc		patch \| blob \| blame \| history
samples/ribbon/makefile.gcc		patch \| blob \| blame \| history
samples/ribbon/makefile.unx		patch \| blob \| blame \| history
samples/ribbon/makefile.vc		patch \| blob \| blame \| history
samples/ribbon/makefile.wat		patch \| blob \| blame \| history
samples/ribbon/ribbon.dsp		patch \| blob \| blame \| history
samples/ribbon/ribbon_vc7.sln		patch \| blob \| blame \| history
samples/ribbon/ribbon_vc7.vcproj		patch \| blob \| blame \| history
samples/ribbon/ribbon_vc8.sln		patch \| blob \| blame \| history
samples/ribbon/ribbon_vc8.vcproj		patch \| blob \| blame \| history
samples/ribbon/ribbon_vc9.sln		patch \| blob \| blame \| history
samples/ribbon/ribbon_vc9.vcproj		patch \| blob \| blame \| history
utils/Makefile.in		patch \| blob \| blame \| history
utils/execmon/execmon_vc9.vcproj		patch \| blob \| blame \| history
utils/execmon/makefile.bcc		patch \| blob \| blame \| history
utils/execmon/makefile.gcc		patch \| blob \| blame \| history
utils/execmon/makefile.vc		patch \| blob \| blame \| history
utils/execmon/makefile.wat		patch \| blob \| blame \| history
utils/makefile.bcc		patch \| blob \| blame \| history
utils/makefile.gcc		patch \| blob \| blame \| history
utils/makefile.vc		patch \| blob \| blame \| history
utils/makefile.wat		patch \| blob \| blame \| history